From b7ef82250ed9f78d6016388aae1687d25edc5ef0 Mon Sep 17 00:00:00 2001 From: "R. Bernstein" Date: Wed, 27 Jan 2010 22:24:34 -0500 Subject: [PATCH] Assume nowadays Standard C is Standard C --- src/cd-paranoia/getopt.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/cd-paranoia/getopt.h b/src/cd-paranoia/getopt.h index fb30719a..348e0fe5 100644 --- a/src/cd-paranoia/getopt.h +++ b/src/cd-paranoia/getopt.h @@ -99,14 +99,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 (int argc, char *const *argv, const char *optstring); 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,