--- lib/argp.h.orig	2007-09-25 11:04:18.000000000 +0200
+++ lib/argp.h.orig	2007-09-25 11:06:24.000000000 +0200
@@ -580,7 +580,11 @@ 
 # endif
 
 # ifndef ARGP_EI
-#  define ARGP_EI extern __inline__
+#  if defined __GNUC_STDC_INLINE__
+#    define ARGP_EI extern __inline__ __attribute__((__gnu_inline__))
+#  else
+#    define ARGP_EI extern __inline__
+#  endif
 # endif
 
 ARGP_EI void
--- lib/argp-fmtstream.h.orig	2007-09-25 11:06:49.000000000 +0200
+++ lib/argp-fmtstream.h.orig	2007-09-25 11:07:35.000000000 +0200
@@ -198,8 +198,12 @@ 
 #endif
 
 #ifndef ARGP_FS_EI
+#ifdef __GNUC_STDC_INLINE__
+#define ARGP_FS_EI extern inline __attribute__((__gnu_inline__))
+#else
 #define ARGP_FS_EI extern inline
 #endif
+#endif
 
 ARGP_FS_EI size_t
 __argp_fmtstream_write (argp_fmtstream_t __fs,