fix regression in size of nlink_t (broken stat struct) on x86_64

[musl] / include / alltypes.h.in

diff --git a/include/alltypes.h.in b/include/alltypes.h.in
index b245436..644c61d 100644 (file)
--- a/include/alltypes.h.in
+++ b/include/alltypes.h.in
@@ -3,6 +3,7 @@ TYPEDEF unsigned _Addr uintptr_t;
 TYPEDEF _Addr ptrdiff_t;
 TYPEDEF _Addr ssize_t;
 TYPEDEF _Addr intptr_t;
+TYPEDEF _Addr regoff_t;
 
 TYPEDEF signed char     int8_t;
 TYPEDEF short           int16_t;
@@ -16,7 +17,7 @@ TYPEDEF unsigned _Int64 uint64_t;
 TYPEDEF unsigned _Int64 uintmax_t;
 
 TYPEDEF unsigned mode_t;
-TYPEDEF unsigned nlink_t;
+TYPEDEF unsigned _Reg nlink_t;
 TYPEDEF _Int64 off_t;
 TYPEDEF unsigned _Int64 ino_t;
 TYPEDEF unsigned _Int64 dev_t;
@@ -46,11 +47,11 @@ TYPEDEF unsigned long pthread_t;
 TYPEDEF struct __pthread * pthread_t;
 #endif
 TYPEDEF int pthread_once_t;
-TYPEDEF int pthread_key_t;
+TYPEDEF unsigned pthread_key_t;
 TYPEDEF int pthread_spinlock_t;
-TYPEDEF unsigned pthread_mutexattr_t;
-TYPEDEF unsigned pthread_condattr_t;
-TYPEDEF unsigned pthread_barrierattr_t;
+TYPEDEF struct { unsigned __attr; } pthread_mutexattr_t;
+TYPEDEF struct { unsigned __attr; } pthread_condattr_t;
+TYPEDEF struct { unsigned __attr; } pthread_barrierattr_t;
 TYPEDEF struct { unsigned __attr[2]; } pthread_rwlockattr_t;
 
 TYPEDEF struct _IO_FILE FILE;