From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 8 Jan 2017 05:14:34 +0000 (+1300)
Subject: Cleanup: remove --disable-inline and related macros
X-Git-Tag: M-staged-PR71~314
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10185a380208acabddb1f695b376c082a018f583;p=thirdparty%2Fsquid.git

Cleanup: remove --disable-inline and related macros

With the .cci files gone there is no longer any use of the SQUID_INLINE
macro. Which in turn removes the need for _USE_INLINE_ macro and then the
--disable-inline build option which sets that.

The relevant compiler specific *FLAGS option should be used instead to
disable compiler inlining functions without special macro usage.
---

diff --git a/configure.ac b/configure.ac
index 644e3e9c15..cb38b63628 100644
--- a/configure.ac
+++ b/configure.ac
@@ -381,36 +381,13 @@ AC_ARG_ENABLE(optimizations,
                   Optimization is good for production builds, but not
                   good for debugging. During development, use
                   --disable-optimizations to reduce compilation times
-                  and allow easier debugging. This option implies
-                  --disable-inline]), [
+                  and allow easier debugging.]), [
 if test "x$enableval" = "xno" ; then
   AC_MSG_NOTICE([Disabling compiler optimizations (-O flag)])
   CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9g]]*//'`"
   CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-O[[0-9g]]*//'`"
-  enable_inline="no"
-fi
-])
-
-AH_TEMPLATE(_USE_INLINE_,[Include inline methods into header file])
-AC_ARG_ENABLE(inline,
-  AS_HELP_STRING([--disable-inline],
-                 [Do not compile trivial methods as inline. Squid
-                  is coded with much of the code able to be inlined.
-                  Inlining is good for production builds, but not
-                  good for development. During development, use
-                  --disable-inline to reduce compilation times and
-                  allow incremental builds to be quick. For
-                  production builds, or load tests, use
-                  --enable-inline to have squid make all trivial
-                  methods inlinable by the compiler.]), [
-SQUID_YESNO([$enableval],
-  [Unrecognized argument to --disable-inline: $enableval])
+fi
 ])
-AC_MSG_NOTICE([inlining optimizations enabled: ${enable_inline:=yes}])
-SQUID_DEFINE_BOOL(_USE_INLINE_,$enable_inline,
-  [Include inline methods into header file])
-# to be used by sub-commands
-export enable_inline
 
 AC_ARG_ENABLE(debug-cbdata,
   AS_HELP_STRING([--enable-debug-cbdata],
diff --git a/doc/release-notes/release-5.sgml b/doc/release-notes/release-5.sgml
index 58e6122bf5..a020b2e58d 100644
--- a/doc/release-notes/release-5.sgml
+++ b/doc/release-notes/release-5.sgml
@@ -121,7 +121,8 @@ This section gives an account of those changes in three categories:
 <sect1>Changes to existing options<label id="modifiedoptions">
 <p>
 <descrip>
-	<p>No changes to existing options in this version.
+	<tag>--disable-optimizations</tag>
+	<p>No longer implies <em>--disable-inline</em> option (which is removed).
 
 </descrip>
 </p>
@@ -129,7 +130,8 @@ This section gives an account of those changes in three categories:
 <sect1>Removed options<label id="removedoptions">
 <p>
 <descrip>
-	<p>No removed options in this version.
+	<tag>--disable-inline</tag>
+	<p>Removed.
 
 </descrip>
 
diff --git a/include/squid.h b/include/squid.h
index e11a6ee1ff..15912e6566 100644
--- a/include/squid.h
+++ b/include/squid.h
@@ -28,12 +28,6 @@
 #define SQUIDCEXTERN extern
 #endif
 
-#if _USE_INLINE_
-#define _SQUID_INLINE_ inline
-#else
-#define _SQUID_INLINE_
-#endif
-
 /****************************************************************************
  *--------------------------------------------------------------------------*
  * DO *NOT* MAKE ANY CHANGES below here unless you know what you're doing...*
diff --git a/test-suite/buildtests/layer-01-minimal.opts b/test-suite/buildtests/layer-01-minimal.opts
index 77e23af181..da8f2db739 100644
--- a/test-suite/buildtests/layer-01-minimal.opts
+++ b/test-suite/buildtests/layer-01-minimal.opts
@@ -39,7 +39,6 @@ DISTCHECK_CONFIGURE_FLAGS=" \
 	--disable-loadable-modules \
 	--disable-gnuregex \
 	--disable-optimizations \
-	--disable-inline \
 	--disable-debug-cbdata \
 	--disable-xmalloc-statistics \
 	--disable-async-io \
diff --git a/test-suite/buildtests/layer-02-maximus.opts b/test-suite/buildtests/layer-02-maximus.opts
index 12cf7aaf66..4c81050c6d 100644
--- a/test-suite/buildtests/layer-02-maximus.opts
+++ b/test-suite/buildtests/layer-02-maximus.opts
@@ -54,7 +54,6 @@ DISTCHECK_CONFIGURE_FLAGS=" \
 	--enable-loadable-modules \
 	--enable-gnuregex \
 	--enable-optimizations \
-	--enable-inline \
 	--enable-debug-cbdata \
 	--enable-xmalloc-statistics \
 	--enable-async-io \