projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix AS-safety of close when aio is in use and fd map is expanded
[musl]
/
include
/
sys
/
types.h
diff --git
a/include/sys/types.h
b/include/sys/types.h
index
b9b65f6
..
3363374
100644
(file)
--- a/
include/sys/types.h
+++ b/
include/sys/types.h
@@
-4,6
+4,8
@@
extern "C" {
#endif
extern "C" {
#endif
+#include <features.h>
+
#define __NEED_ino_t
#define __NEED_dev_t
#define __NEED_uid_t
#define __NEED_ino_t
#define __NEED_dev_t
#define __NEED_uid_t
@@
-18,15
+20,6
@@
extern "C" {
#define __NEED_timer_t
#define __NEED_clockid_t
#define __NEED_timer_t
#define __NEED_clockid_t
-#define __NEED_int8_t
-#define __NEED_int16_t
-#define __NEED_int32_t
-#define __NEED_int64_t
-
-#define __NEED___uint16_t
-#define __NEED___uint32_t
-#define __NEED___uint64_t
-
#define __NEED_blkcnt_t
#define __NEED_fsblkcnt_t
#define __NEED_fsfilcnt_t
#define __NEED_blkcnt_t
#define __NEED_fsblkcnt_t
#define __NEED_fsfilcnt_t
@@
-50,15
+43,23
@@
extern "C" {
#define __NEED_pthread_spinlock_t
#define __NEED_pthread_key_t
#define __NEED_pthread_once_t
#define __NEED_pthread_spinlock_t
#define __NEED_pthread_key_t
#define __NEED_pthread_once_t
+#define __NEED_useconds_t
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define __NEED_int8_t
+#define __NEED_int16_t
+#define __NEED_int32_t
+#define __NEED_int64_t
+#define __NEED_u_int64_t
+#define __NEED_register_t
+#endif
#include <bits/alltypes.h>
#include <bits/alltypes.h>
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
typedef unsigned char u_int8_t;
typedef unsigned char u_int8_t;
-typedef __uint16_t u_int16_t;
-typedef __uint32_t u_int32_t;
-typedef __uint64_t u_int64_t;
-
-#ifdef _GNU_SOURCE
+typedef unsigned short u_int16_t;
+typedef unsigned u_int32_t;
typedef char *caddr_t;
typedef unsigned char u_char;
typedef unsigned short u_short, ushort;
typedef char *caddr_t;
typedef unsigned char u_char;
typedef unsigned short u_short, ushort;
@@
-66,14
+67,11
@@
typedef unsigned u_int, uint;
typedef unsigned long u_long, ulong;
typedef long long quad_t;
typedef unsigned long long u_quad_t;
typedef unsigned long u_long, ulong;
typedef long long quad_t;
typedef unsigned long long u_quad_t;
-typedef long register_t;
#include <endian.h>
#include <sys/select.h>
#include <endian.h>
#include <sys/select.h>
-#include <sys/sysmacros.h>
#endif
#endif
-#ifdef _LARGEFILE64_SOURCE
-#define blksize64_t blksize_t
+#if defined(_LARGEFILE64_SOURCE)
#define blkcnt64_t blkcnt_t
#define fsblkcnt64_t fsblkcnt_t
#define fsfilcnt64_t fsfilcnt_t
#define blkcnt64_t blkcnt_t
#define fsblkcnt64_t fsblkcnt_t
#define fsfilcnt64_t fsfilcnt_t
@@
-85,5
+83,3
@@
typedef long register_t;
}
#endif
#endif
}
#endif
#endif
-
-