aboutsummaryrefslogtreecommitdiff
path: root/posix/getopt.h
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-02-18 03:51:45 +0000
committerRoland McGrath <roland@gnu.org>1995-02-18 03:51:45 +0000
commit0ad46177053e2c91b967d7193eeaf43e82f279ea (patch)
tree35804bc94c9d7f43cd78398a061052e38f4e9141 /posix/getopt.h
parent28f540f45bbacd939bfd07f213bcad2bf730b1bf (diff)
downloadglibc-0ad46177053e2c91b967d7193eeaf43e82f279ea.zip
glibc-0ad46177053e2c91b967d7193eeaf43e82f279ea.tar.gz
glibc-0ad46177053e2c91b967d7193eeaf43e82f279ea.tar.bz2
Updated from ../gpl2lgpl.sed /home/gd/gnu/lib/getopt.c
Diffstat (limited to 'posix/getopt.h')
-rw-r--r--posix/getopt.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/posix/getopt.h b/posix/getopt.h
index ab50378..f3696d9 100644
--- a/posix/getopt.h
+++ b/posix/getopt.h
@@ -1,5 +1,5 @@
/* Declarations for getopt.
- Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
+ Copyright (C) 1989, 90, 91, 92, 93, 94 Free Software Foundation, Inc.
This file is part of the GNU C Library. Its master source is NOT part of
the C library, however. The master source lives in /gd/gnu/lib.
@@ -80,7 +80,7 @@ extern int optopt;
struct option
{
-#if __STDC__
+#if defined (__STDC__) && __STDC__
const char *name;
#else
char *name;
@@ -98,15 +98,15 @@ struct option
#define required_argument 1
#define optional_argument 2
-#if __STDC__
-#if defined(__GNU_LIBRARY__)
+#if defined (__STDC__) && __STDC__
+#ifdef __GNU_LIBRARY__
/* Many other libraries have conflicting prototypes for getopt, with
differences in the consts, in stdlib.h. To avoid compilation
errors, only prototype getopt for the GNU C library. */
extern int getopt (int argc, char *const *argv, const char *shortopts);
#else /* not __GNU_LIBRARY__ */
extern int getopt ();
-#endif /* not __GNU_LIBRARY__ */
+#endif /* __GNU_LIBRARY__ */
extern int getopt_long (int argc, char *const *argv, const char *shortopts,
const struct option *longopts, int *longind);
extern int getopt_long_only (int argc, char *const *argv,
@@ -124,7 +124,7 @@ extern int getopt_long ();
extern int getopt_long_only ();
extern int _getopt_internal ();
-#endif /* not __STDC__ */
+#endif /* __STDC__ */
#ifdef __cplusplus
}