Changeset 371bd7d in mainline for uspace/lib/c/include/unistd.h

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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 ) (3 diffs)

uspace/lib/c/include/unistd.h

@@ -47 +47 @@
 #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);
@@ -56 +64 @@
 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);
@@ -67 +75 @@
 extern int chdir(const char *);
 
-extern void _exit(int status) __attribute__ ((noreturn));
-extern int usleep(unsigned long usec);
-extern unsigned int sleep(unsigned int seconds);
+extern void _exit(int) __attribute__((noreturn));
+extern int usleep(useconds_t);
+extern unsigned int sleep(unsigned int);
 
 #endif