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

Timestamp:

2013-07-24T17:42:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

File:

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

uspace/lib/posix/source/unistd.c

@@ -35 +35 @@
 
 #define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
 #include "internal/common.h"
@@ -421 +422 @@
 }
 
+unsigned int posix_alarm(unsigned int seconds)
+{
+        not_implemented();
+        return 0;
+}
+
 /** @}
  */