projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
restore attribute((const)) to pthread_self and errno location decls
[musl]
/
include
/
sys
/
types.h
diff --git
a/include/sys/types.h
b/include/sys/types.h
index
db8661b
..
75e489c
100644
(file)
--- a/
include/sys/types.h
+++ b/
include/sys/types.h
@@
-20,11
+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_blkcnt_t
#define __NEED_fsblkcnt_t
#define __NEED_fsfilcnt_t
#define __NEED_blkcnt_t
#define __NEED_fsblkcnt_t
#define __NEED_fsfilcnt_t
@@
-50,14
+45,21
@@
extern "C" {
#define __NEED_pthread_once_t
#define __NEED_useconds_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 short u_int16_t;
typedef unsigned u_int32_t;
typedef unsigned char u_int8_t;
typedef unsigned short u_int16_t;
typedef unsigned u_int32_t;
-typedef unsigned long long u_int64_t;
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
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;
@@
-65,14
+67,12
@@
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 <sys/sysmacros.h>
#endif
#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
#include <endian.h>
#include <sys/select.h>
#include <sys/sysmacros.h>
#endif
#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
-#define blksize64_t blksize_t
#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
@@
-84,5
+84,3
@@
typedef long register_t;
}
#endif
#endif
}
#endif
#endif
-
-