Changeset 46c20c8 in mainline for uspace/lib/c/include/unistd.h

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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/c/include/unistd.h (moved) (moved from uspace/lib/libc/include/unistd.h ) (4 diffs)

uspace/lib/c/include/unistd.h

@@ -37 +37 @@
 
 #include <sys/types.h>
+#include <time.h>
 #include <libarch/config.h>
 
 #ifndef NULL
-        #define NULL  0
+        #define NULL    ((void *) 0)
 #endif
 
@@ -47 +48 @@
 #ifndef SEEK_SET
         #define SEEK_SET  0
+#endif
+
+#ifndef SEEK_CUR
         #define SEEK_CUR  1
+#endif
+
+#ifndef SEEK_END
         #define SEEK_END  2
 #endif
-
-typedef uint32_t useconds_t;
 
 extern int dup2(int oldfd, int newfd);
@@ -58 +63 @@
 extern ssize_t read(int, void *, size_t);
 
-extern off_t lseek(int, off_t, int);
-extern int ftruncate(int, off_t);
+extern off64_t lseek(int, off64_t, int);
+extern int ftruncate(int, aoff64_t);
 
 extern int close(int);
@@ -69 +74 @@
 extern int chdir(const char *);
 
-extern void _exit(int status) __attribute__ ((noreturn));
-extern int usleep(useconds_t uses);
-extern unsigned int sleep(unsigned int se);
+extern void _exit(int) __attribute__((noreturn));
+extern int usleep(useconds_t);
+extern unsigned int sleep(unsigned int);
 
 #endif