X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fargp.h;h=90c4528315270e84103074aa79372d04da9282f8;hb=b314ca18dc36e59297f66b2508fd58535a1cd724;hp=c409ec40c1a5c09d92776adfd70875f43512f875;hpb=10c66621299512e7b45824d76cc680ff06c3fd86;p=gnulib.git

diff --git a/lib/argp.h b/lib/argp.h
index c409ec40c..90c452831 100644
--- a/lib/argp.h
+++ b/lib/argp.h
@@ -1,5 +1,5 @@
 /* Hierarchial argument parsing, layered over getopt.
-   Copyright (C) 1995-1999,2003-2007 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999,2003-2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Miles Bader <miles@gnu.ai.mit.edu>.
 
@@ -36,7 +36,7 @@
 
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
 #  define __attribute__(Spec) /* empty */
 # endif
 /* The __-protected variants of `format' and `printf' attributes
@@ -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__