Prefer the ISO C99 inline semantics over the old GNU C inline semantics.

diff --git a/ChangeLog b/ChangeLog
index 9449892bd407a139d91fa3bc01e3fb756572bf36..ec94edaeb315f5b1a6d0615edc3fcfade6cbb184 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-13  Bruno Haible  <bruno@clisp.org>
+
+       * lib/argp-fmtstream.h (ARGP_FS_EI): If __GNUC_STDC_INLINE__ is
+       defined, use the ISO C99 inline semantics.
+       * lib/argp.h (ARGP_EI): Likewise.
+
 2007-10-13  Bruno Haible  <bruno@clisp.org>
 
        Handle 'inline' change in gcc 4.3.0.

diff --git a/lib/argp-fmtstream.h b/lib/argp-fmtstream.h
index 18033192bb5b2a5f147dde320183e3125e80b417..50f1387f4ee0d113d8dd11e29aefbf61c2439db4 100644 (file)
--- a/lib/argp-fmtstream.h
+++ b/lib/argp-fmtstream.h
@@ -211,7 +211,9 @@ extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
         warning: C99 inline functions are not supported; using GNU89
         warning: to disable this warning use -fgnu89-inline or the gnu_inline function attribute
       It defines a macro __GNUC_GNU_INLINE__ to indicate this situation.  */
-#  if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
+#  if defined __GNUC_STDC_INLINE__
+#   define ARGP_FS_EI inline
+#  elif defined __GNUC_GNU_INLINE__
 #   define ARGP_FS_EI extern inline __attribute__ ((__gnu_inline__))
 #  else
 #   define ARGP_FS_EI extern inline

diff --git a/lib/argp.h b/lib/argp.h
index c409ec40c1a5c09d92776adfd70875f43512f875..aa76eb4e43df035933a41fe067809f0e9c2eba14 100644 (file)
--- a/lib/argp.h
+++ b/lib/argp.h
@@ -593,7 +593,9 @@ extern void *__argp_input (const struct argp *__restrict __argp,
          warning: C99 inline functions are not supported; using GNU89
          warning: to disable this warning use -fgnu89-inline or the gnu_inline function attribute
        It defines a macro __GNUC_GNU_INLINE__ to indicate this situation.  */
-#   if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
+#   if defined __GNUC_STDC_INLINE__
+#    define ARGP_EI __inline__
+#   elif defined __GNUC_GNU_INLINE__
 #    define ARGP_EI extern __inline__ __attribute__ ((__gnu_inline__))
 #   else
 #    define ARGP_EI extern __inline__