X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=getopt%2Fgetopt.h;h=da0a54adc618e07f2abc19d0b7c79615e527c48e;hb=860a2e338a79d7a01d551bc5a70def43f60bdb77;hp=b0147e9d2ac314401941304659c3c19575f025df;hpb=13838bda88b63a2535b5baaf7197006767de4b8e;p=ctsim.git

diff --git a/getopt/getopt.h b/getopt/getopt.h
index b0147e9..da0a54a 100644
--- a/getopt/getopt.h
+++ b/getopt/getopt.h
@@ -19,6 +19,10 @@
 
 #ifndef _GETOPT_H
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 #ifndef __need_getopt
 # define _GETOPT_H 1
 #endif
@@ -82,7 +86,7 @@ extern int optopt;
 
 struct option
 {
-# if defined __STDC__ && __STDC__
+# if defined __STDC__
   const char *name;
 # else
   char *name;
@@ -126,19 +130,19 @@ struct option
    arguments to the option '\0'.  This behavior is specific to the GNU
    `getopt'.  */
 
-#if defined __STDC__ && __STDC__
+#if defined __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 ();
+  /* extern int getopt (); */
 # endif /* __GNU_LIBRARY__ */
 
 # 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 (int argc, char *const *argv, const char *shortopts,
+		        const struct option *longopts, int *longind);
 extern int getopt_long_only (int __argc, char *const *__argv,
 			     const char *__shortopts,
 		             const struct option *__longopts, int *__longind);
@@ -152,10 +156,15 @@ extern int _getopt_internal (int __argc, char *const *__argv,
 #else /* not __STDC__ */
 extern int getopt ();
 # ifndef __need_getopt
-extern int getopt_long ();
-extern int getopt_long_only ();
-
-extern int _getopt_internal ();
+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,
+			     const char *__shortopts,
+		             const struct option *__longopts, int *__longind);
+extern int _getopt_internal (int __argc, char *const *__argv,
+			     const char *__shortopts,
+		             const struct option *__longopts, int *__longind,
+			     int __long_only);
 # endif
 #endif /* __STDC__ */