summaryrefslogtreecommitdiff
path: root/lib/getopt.c
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>1994-02-12 17:23:44 +0000
committerJim Meyering <jim@meyering.net>1994-02-12 17:23:44 +0000
commit9935449e9d464ac7033838d74633b299daffb970 (patch)
tree678cebc28124844ccaac40c9e71ecb749044d70e /lib/getopt.c
parent4caa3d07cfffdb530250195f9df116d39b6fbcd0 (diff)
downloadcoreutils-9935449e9d464ac7033838d74633b299daffb970.tar.xz
merge with 1.9.2i
Diffstat (limited to 'lib/getopt.c')
-rw-r--r--lib/getopt.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/getopt.c b/lib/getopt.c
index 6cdedb019..65af7ecd5 100644
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -195,11 +195,9 @@ my_index (str, chr)
}
/* If using GCC, we can safely declare strlen this way.
- If not using GCC, it is ok not to declare it.
- (Supposedly there are some machines where it might get a warning,
- but changing this conditional to __STDC__ is too risky.) */
+ If not using GCC, it is ok not to declare it. */
#ifdef __GNUC__
-#if ! (defined (emacs) && !defined (__STDC__))
+#ifndef __STDC__
#ifdef IN_GCC
#include "gstddef.h"
#else /* not IN_GCC */
@@ -208,7 +206,7 @@ my_index (str, chr)
#include <stddef.h>
#endif /* not IN_GCC */
extern size_t strlen (const char *);
-#endif /* ! (defined (emacs) && !defined (__STDC__)) */
+#endif /* not __STDC__ */
#endif /* __GNUC__ */
#endif /* not __GNU_LIBRARY__ */