Changeset 1624 for trunk/src/emx/include/getopt.h

Timestamp:

Nov 8, 2004, 2:06:04 AM (21 years ago)

Author:

bird

Message:

Updated some headers to 5.2/3 level.

File:

• trunk/src/emx/include/getopt.h (modified) (4 diffs, 1 prop)

trunk/src/emx/include/getopt.h

@@ -1 +1 @@
 /* getopt.h,v 1.6 2004/09/14 22:27:33 bird Exp */
 /** @file
- * FreeBSD 5.1
- * @changed bird: Added two GNU apis for libiberty.
+ * FreeBSD 5.2
+ * @changed bird: Added one GNU api from libiberty.
  */
 
 /*      $NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $    */
-/*      $FreeBSD: src/include/getopt.h,v 1.1 2002/09/29 04:14:30 eric Exp $ */
+/*      $FreeBSD: src/include/getopt.h,v 1.6 2004/02/24 08:09:20 ache Exp $ */
 
 /*-
@@ -44 +44 @@
  */
 
-
 #ifndef _GETOPT_H_
 #define _GETOPT_H_
 
 #include <sys/cdefs.h>
-#include <unistd.h>
 
 /*
- * Gnu like getopt_long() and BSD4.4 getsubopt()/optreset extensions
+ * GNU-like getopt_long()/getopt_long_only() with 4.4BSD optreset extension.
+ * getopt() is declared here too for GNU programs.
  */
-#if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE)
 #define no_argument        0
 #define required_argument  1
@@ -74 +72 @@
 
 __BEGIN_DECLS
-int getopt_long __P((int, char * const *, const char *,
-    const struct option *, int *));
+int     getopt_long(int, char * const *, const char *,
+        const struct option *, int *);
+int     getopt_long_only(int, char * const *, const char *,
+        const struct option *, int *);
+#ifndef _GETOPT_DECLARED
+#define _GETOPT_DECLARED
+int      getopt(int, char * const [], const char *);
 
-/* bird - start: these are provided thru libiberty. */
-int getopt_long_only __P((int argc, char *const *, const char *,
-    const struct option *, int *));
+extern char *optarg;                    /* getopt(3) external variables */
+extern int optind, opterr, optopt;
+#endif
+#ifndef _OPTRESET_DECLARED
+#define _OPTRESET_DECLARED
+extern int optreset;                    /* getopt(3) external variable */
+#endif
+
+/* bird - start: this is provided thru libiberty. */
 int _getopt_internal __P((int, char *const *, const char *,
     const struct option *, int *, int));
@@ -85 +94 @@
 
 __END_DECLS
-#endif
 
 #endif /* !_GETOPT_H_ */