Changeset 2646 for branches/libc-0.6

Timestamp:

Mar 15, 2006, 3:13:46 AM (19 years ago)

Author:

bird

Message:

#68: Implemented the _GETOPT_DECLARED blocker in getopt.h too.

Location:

branches/libc-0.6/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff)
• include/getopt.h (modified) (5 diffs)

branches/libc-0.6/src/emx/ChangeLog.LIBC

@@ -2 +2 @@
 
 TODO: open replace on RAMFS fails with error 32!
+
+2006-03-14: knut st. osmundsen <bird-gccos2-spam@anduin.net>
+    - libc:
+        o #68: Implemented the _GETOPT_DECLARED blocker in getopt.h too.
 
 2006-03-12: knut st. osmundsen <bird-gccos2-spam@anduin.net>

branches/libc-0.6/src/emx/include/getopt.h

@@ -21 +21 @@
 /** @file
  * GLIBC 2.3.4
+ * @changed bird: Added _GETOPT_DECLARED check and def.
  */
 
@@ -55 +56 @@
 #endif
 
+#ifndef _GETOPT_DECLARED /* bird: see next usage */
+
 /* For communication from `getopt' to the caller.
    When `getopt' finds an option that takes an argument,
@@ -85 +88 @@
 
 extern int optopt;
+
+#endif /* bird */
 
 #ifndef __need_getopt
@@ -150 +155 @@
    `getopt'.  */
 
+#ifndef _GETOPT_DECLARED /* bird: Also defined in unistd.h, this is the blocker. */
+#define _GETOPT_DECLARED /* bird */
 #ifdef __GNU_LIBRARY__
 /* Many other libraries have conflicting prototypes for getopt, with
@@ -159 +166 @@
 extern int getopt ();
 #endif /* __GNU_LIBRARY__ */
+#endif /* bird */
+
 
 #ifndef __need_getopt