Undef __P before defining it.

diff --git a/lib/linebuffer.h b/lib/linebuffer.h
index 265431ad7c898154d090c60a1022b55917a784a0..5c73951e839738f6846a65123b571f9b04d11bec 100644 (file)
--- a/lib/linebuffer.h
+++ b/lib/linebuffer.h
@@ -24,6 +24,7 @@ struct linebuffer
   char *buffer;
 };
 
+#undef __P
 #if defined (__STDC__) && __STDC__
 #define        __P(x) x
 #else

diff --git a/lib/long-options.h b/lib/long-options.h
index 220305ce6e07c2cd4905f47ac0a8efeda2985d34..986a52d0d47c9bf5be7329a3e33edb8227d21818 100644 (file)
--- a/lib/long-options.h
+++ b/lib/long-options.h
@@ -1,10 +1,9 @@
-#ifndef __P
-#if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
+#undef __P
+#if defined (__STDC__) && __STDC__
 #define __P(args) args
 #else
 #define __P(args) ()
-#endif  /* GCC.  */
-#endif  /* Not __P.  */
+#endif
 
 void
   parse_long_options __P ((int _argc, char **_argv, const char *_command_name,

diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index ff44d6becb0ad7a760e31da8df7f2c4846c9b497..bebeca3b6f3b4dac83bf1d6692eff84f87c9ca78 100644 (file)
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -13,6 +13,7 @@
 # define __ZLONG_MAX LONG_MAX
 #endif
 
+#undef __P
 #if defined (__STDC__) && __STDC__
 #define        __P(x) x
 #else