Add -Winline to the default CFLAGS for gcc, and remove

tglsfdc · tglsfdc · commit 93d358a8a444 · 2005-10-05T17:11:45.000Z
-Wold-style-definition, per recent discussion.
diff --git a/configure b/configure
@@ -2714,7 +2714,7 @@ else
 fi
 
 if test "$GCC" = yes; then
-  CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wpointer-arith"
+  CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wpointer-arith -Winline"
 
   # Some versions of GCC support some additional useful warning flags.
   # Check whether they are supported, and add them to CFLAGS if so.
@@ -2765,59 +2765,6 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-CFLAGS="$pgac_save_CFLAGS"
-                    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-  echo "$as_me:$LINENO: checking if $CC supports -Wold-style-definition" >&5
-echo $ECHO_N "checking if $CC supports -Wold-style-definition... $ECHO_C" >&6
-pgac_save_CFLAGS=$CFLAGS
-CFLAGS="$pgac_save_CFLAGS -Wold-style-definition"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 CFLAGS="$pgac_save_CFLAGS"
                     echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
diff --git a/configure.in b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.426 2005/09/16 17:15:53 pgsql Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.427 2005/10/05 17:11:45 tgl Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -251,12 +251,11 @@ else
 fi
 
 if test "$GCC" = yes; then
-  CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wpointer-arith"
+  CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wpointer-arith -Winline"
 
   # Some versions of GCC support some additional useful warning flags.
   # Check whether they are supported, and add them to CFLAGS if so.
   PGAC_PROG_CC_CFLAGS_OPT([-Wdeclaration-after-statement])
-  PGAC_PROG_CC_CFLAGS_OPT([-Wold-style-definition])
   PGAC_PROG_CC_CFLAGS_OPT([-Wendif-labels])
 
   # Disable strict-aliasing rules; needed for gcc 3.3+
