Changeset e7f7c93 in mainline

Timestamp:

2011-06-18T01:49:11Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

14aa03a

Parents:

ad28599

Message:

Reverted changes causing circular dependencies in types.h.

Location:

uspace/lib/posix/sys

Files:

• stat.h (modified) (2 diffs)
• types.h (modified) (2 diffs)

uspace/lib/posix/sys/stat.h

@@ -40 +40 @@
 #include "types.h"
 #include "../time.h"
+#include <ipc/devmap.h>
+#include <task.h>
+
+typedef devmap_handle_t posix_dev_t;
+typedef task_id_t posix_pid_t;
 
 /* values are the same as on Linux */
@@ -134 +139 @@
 
 #ifndef LIBPOSIX_INTERNAL
+        #define dev_t posix_dev_t
+        #define pid_t posix_pid_t
         #define fstat posix_fstat
         #define lstat posix_lstat

uspace/lib/posix/sys/types.h

@@ -38 +38 @@
 
 #include "../libc/sys/types.h"
-#include <ipc/devmap.h>
-#include <task.h>
 
-typedef task_id_t posix_pid_t;
-typedef devmap_handle_t posix_dev_t;
 typedef unsigned int posix_ino_t;
 typedef unsigned int posix_nlink_t;
@@ -52 +48 @@
 
 #ifndef LIBPOSIX_INTERNAL
-        #define pid_t posix_pid_t
-        #define dev_t posix_dev_t
         #define nlink_t posix_nlink_t
         #define uid_t posix_uid_t