merge with 1.10x1

[gnulib.git] / lib / getopt.c

diff --git a/lib/getopt.c b/lib/getopt.c
index ac0d6f3..4bab2b1 100644 (file)
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -30,7 +30,7 @@
 #include <config.h>
 #endif
 
-#ifndef __STDC__
+#if !defined (__STDC__) || !__STDC__
 /* This is a separate conditional since some stdc systems
    reject `defined (const)'.  */
 #ifndef const
@@ -188,7 +188,7 @@ my_index (str, chr)
 #ifdef __GNUC__
 /* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
    That was relevant to code that was here before.  */
-#ifndef __STDC__
+#if !defined (__STDC__) || !__STDC__
 /* gcc with -traditional declares the built-in strlen to return int,
    and has done so at least since version 2.4.5. -- rms.  */
 extern int strlen (const char *);