fix getopt prototype so that it matches ours, as gcc3 is much more picky

concerning these.
This commit is contained in:
espie 2003-12-29 20:39:37 +00:00
parent a7ecbbc910
commit f2a98539a2
2 changed files with 36 additions and 0 deletions

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-nmixer_getopt_h,v 1.3 2003/12/29 20:39:37 espie Exp $
--- nmixer/getopt.h.orig 2003-12-29 21:30:27.000000000 +0100
+++ nmixer/getopt.h 2003-12-29 21:30:38.000000000 +0100
@@ -97,14 +97,7 @@ struct option
#define optional_argument 2
#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 /* __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,

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_getopt_h,v 1.3 2003/12/29 20:39:37 espie Exp $
--- src/getopt.h.orig 2003-12-29 17:21:09.000000000 +0100
+++ src/getopt.h 2003-12-29 17:21:33.000000000 +0100
@@ -97,14 +97,7 @@ struct option
#define optional_argument 2
#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 /* __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,