Changeset e6a78b9 in mainline for uspace/lib/posix/unistd.h

Timestamp:

2012-06-29T15:31:44Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9432f08

Parents:

34ab31c (diff), 0bbd13e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/posix/unistd.h (modified) (2 diffs)

uspace/lib/posix/unistd.h

@@ -43 +43 @@
 #define _exit exit
 
-/* Option Arguments */
-extern char *optarg;
+extern char *posix_optarg;
 extern int optind, opterr, optopt;
-extern int getopt(int, char * const [], const char *);
+extern int posix_getopt(int, char * const [], const char *);
 
 /* Environment */
@@ -144 +143 @@
 
 #ifndef LIBPOSIX_INTERNAL
+        #define getopt posix_getopt
+        #define optarg posix_optarg
+
         #define environ posix_environ