projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor headers, especially alltypes.h, and improve C++ ABI compat
[musl]
/
include
/
sys
/
types.h
diff --git
a/include/sys/types.h
b/include/sys/types.h
index
18433f8
..
db8661b
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
@@
-23,10
+25,6
@@
extern "C" {
#define __NEED_int32_t
#define __NEED_int64_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
+48,16
@@
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
#include <bits/alltypes.h>
typedef unsigned char u_int8_t;
#include <bits/alltypes.h>
typedef unsigned char u_int8_t;
-typedef
__uint16_
t u_int16_t;
-typedef
__uint32_t
u_int32_t;
-typedef
__uint64_t
u_int64_t;
+typedef
unsigned shor
t u_int16_t;
+typedef
unsigned
u_int32_t;
+typedef
unsigned long long
u_int64_t;
-#if
def _GNU_SOURCE
+#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;
@@
-72,6
+71,15
@@
typedef long register_t;
#include <sys/sysmacros.h>
#endif
#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 ino64_t ino_t
+#define off64_t off_t
+#endif
+
#ifdef __cplusplus
}
#endif
#ifdef __cplusplus
}
#endif