Changeset e6edc8d1 in mainline for uspace/lib/posix/include/posix/stddef.h

Timestamp:

2013-07-11T19:13:37Z (12 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

67632f7

Parents:

52ff62d3 (diff), 2b3e8840 (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 with mainline changes.

File:

• uspace/lib/posix/include/posix/stddef.h (modified) (2 diffs)

uspace/lib/posix/include/posix/stddef.h

@@ -36 +36 @@
 #define POSIX_STDDEF_H_
 
+#ifndef __POSIX_DEF__
+#define __POSIX_DEF__(x) x
+#endif
+
 #include "sys/types.h"
 
@@ -44 +48 @@
 #define offsetof(type,member) ((size_t) &(((type *) 0)->member))
 
-typedef ssize_t posix_ptrdiff_t;
+typedef ssize_t __POSIX_DEF__(ptrdiff_t);
 
-#ifndef LIBPOSIX_INTERNAL
-        #define ptrdiff_t posix_ptrdiff_t
-#endif
 
 #endif /* POSIX_STDDEF_H_ */