Changeset 4c53333 in mainline for uspace/lib/posix/source/unistd.c

Timestamp:

2013-07-11T08:21:10Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (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/source/unistd.c (moved) (moved from uspace/lib/posix/unistd.c ) (3 diffs)

uspace/lib/posix/source/unistd.c

@@ -35 +35 @@
 
 #define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
 #include "internal/common.h"
-#include "unistd.h"
-
-#include "errno.h"
-#include "string.h"
-#include "fcntl.h"
+#include "posix/unistd.h"
+
+#include "posix/errno.h"
+#include "posix/string.h"
+#include "posix/fcntl.h"
 
 #include "libc/task.h"
@@ -49 +50 @@
 /* Array of environment variable strings (NAME=VALUE). */
 char **posix_environ = NULL;
+char *posix_optarg;
 
 /**
@@ -420 +422 @@
 }
 
+unsigned int posix_alarm(unsigned int seconds)
+{
+        not_implemented();
+        return 0;
+}
+
 /** @}
  */