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

Timestamp:

2012-05-18T11:31:26Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a54bd98, df3f85f

Parents:

3e67ab1 (diff), 68f57e1 (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 MSIM simulator port (#401)

Merged from lp:~vojtech-horky/helenos/msim.

Not all features work, but it is possible to boot HelenOS running in
MSIM that runs in HelenOS in Qemu
(i.e. host → Qemu → HelenOS → MSIM → HelenOS).

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