summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-07-02 05:23:33 +0000
committerEric Andersen <andersen@codepoet.org>2002-07-02 05:23:33 +0000
commitad9e48c94eae733827054009936f80e2ecda3bb9 (patch)
tree5385d5cbf614da0ca3ef9481d401279cdc400f8c
parentaf68c004cf0e5a549d9742b8dfb32120c0b75aeb (diff)
fix this header so it behaves itself
-Erik
-rw-r--r--include/getopt.h22
1 files changed, 2 insertions, 20 deletions
diff --git a/include/getopt.h b/include/getopt.h
index a1b8dd665..fd1cb7b15 100644
--- a/include/getopt.h
+++ b/include/getopt.h
@@ -93,11 +93,7 @@ extern int optopt;
struct option
{
-# if (defined __STDC__ && __STDC__) || defined __cplusplus
const char *name;
-# else
- char *name;
-# endif
/* has_arg can't be an enum because some compilers complain about
type mismatches in all the code that assumes it is an int. */
int has_arg;
@@ -137,17 +133,12 @@ struct option
arguments to the option '\0'. This behavior is specific to the GNU
`getopt'. */
-#if (defined __STDC__ && __STDC__) || defined __cplusplus
-# 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 /* __GNU_LIBRARY__ */
-# ifndef __need_getopt
+#ifndef __need_getopt
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,
@@ -159,16 +150,7 @@ extern int _getopt_internal (int __argc, char *const *__argv,
const char *__shortopts,
const struct option *__longopts, int *__longind,
int __long_only);
-# endif
-#else /* not __STDC__ */
-extern int getopt ();
-# ifndef __need_getopt
-extern int getopt_long ();
-extern int getopt_long_only ();
-
-extern int _getopt_internal ();
-# endif
-#endif /* __STDC__ */
+#endif
#ifdef __cplusplus
}