From f2a98539a252bb60dab84cb44f1d51e81a3ebb17 Mon Sep 17 00:00:00 2001 From: espie Date: Mon, 29 Dec 2003 20:39:37 +0000 Subject: [PATCH] fix getopt prototype so that it matches ours, as gcc3 is much more picky concerning these. --- audio/mp3blaster/patches/patch-nmixer_getopt_h | 18 ++++++++++++++++++ audio/mp3blaster/patches/patch-src_getopt_h | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 audio/mp3blaster/patches/patch-nmixer_getopt_h create mode 100644 audio/mp3blaster/patches/patch-src_getopt_h diff --git a/audio/mp3blaster/patches/patch-nmixer_getopt_h b/audio/mp3blaster/patches/patch-nmixer_getopt_h new file mode 100644 index 00000000000..cb881858389 --- /dev/null +++ b/audio/mp3blaster/patches/patch-nmixer_getopt_h @@ -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, diff --git a/audio/mp3blaster/patches/patch-src_getopt_h b/audio/mp3blaster/patches/patch-src_getopt_h new file mode 100644 index 00000000000..a5e341e4fbd --- /dev/null +++ b/audio/mp3blaster/patches/patch-src_getopt_h @@ -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,