r261: Use explicit std:: namespace

[ctsim.git] / getopt / getopt.h

diff --git a/getopt/getopt.h b/getopt/getopt.h
index b0147e9d2ac314401941304659c3c19575f025df..c5f98619b9a033d5fc4decebd39840598d0c064d 100644 (file)
--- a/getopt/getopt.h
+++ b/getopt/getopt.h
@@ -82,7 +82,7 @@ extern int optopt;
 
 struct option
 {
-# if defined __STDC__ && __STDC__
+# if defined __STDC__
   const char *name;
 # else
   char *name;
@@ -126,7 +126,7 @@ 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
@@ -137,8 +137,8 @@ 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 +152,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,\r
+                       const struct option *longopts, int *longind);\r
+extern int getopt_long_only (int __argc, char *const *__argv,\r
+                            const char *__shortopts,\r
+                            const struct option *__longopts, int *__longind);\r
+extern int _getopt_internal (int __argc, char *const *__argv,\r
+                            const char *__shortopts,\r
+                            const struct option *__longopts, int *__longind,\r
+                            int __long_only);\r
 # endif
 #endif /* __STDC__ */