Changeset c23275a in mainline

Timestamp:

2017-04-02T21:08:10Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

438f355

Parents:

d96d9bc

Message:

Move stuff away from unistd.h

Location:

uspace

Files:

• app/fontviewer/fontviewer.c (modified) (1 diff)
• app/viewer/viewer.c (modified) (1 diff)
• lib/c/include/stdio.h (modified) (1 diff)
• lib/c/include/stdlib.h (modified) (1 diff)
• lib/c/include/unistd.h (modified) (1 diff)
• lib/gui/window.c (modified) (1 diff)

uspace/app/fontviewer/fontviewer.c

@@ -34 +34 @@
 
 #include <stdio.h>
-#include <unistd.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <malloc.h>

uspace/app/viewer/viewer.c

@@ -34 +34 @@
 
 #include <stdio.h>
-#include <unistd.h>
+#include <stdlib.h>
 #include <vfs/vfs.h>
 #include <errno.h>

uspace/lib/c/include/stdio.h

@@ -43 +43 @@
 
 #define EOF  (-1)
+
+#ifndef SEEK_SET
+        #define SEEK_SET  0
+#endif
+
+#ifndef SEEK_CUR
+        #define SEEK_CUR  1
+#endif
+
+#ifndef SEEK_END
+        #define SEEK_END  2
+#endif
 
 /** Default size for stream I/O buffers */

uspace/lib/c/include/stdlib.h

@@ -49 +49 @@
 
 extern void abort(void) __attribute__((noreturn));
+extern void exit(int) __attribute__((noreturn));
 
 #endif

uspace/lib/c/include/unistd.h

@@ -44 +44 @@
 #endif
 
-#ifndef SEEK_SET
-        #define SEEK_SET  0
-#endif
-
-#ifndef SEEK_CUR
-        #define SEEK_CUR  1
-#endif
-
-#ifndef SEEK_END
-        #define SEEK_END  2
-#endif
-
 #define getpagesize()  (PAGE_SIZE)
 
-extern void exit(int) __attribute__((noreturn));
 extern int usleep(useconds_t);
 extern unsigned int sleep(unsigned int);

uspace/lib/gui/window.c

@@ -37 +37 @@
 #include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <as.h>