about summary refs log tree commit diff
path: root/include/sys
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2013-07-22 11:22:36 -0400
committerRich Felker <dalias@aerifal.cx>2013-07-22 11:22:36 -0400
commit9448b0513e2eec020fbca9c10412b83df5027a16 (patch)
tree7288ee417c591cd92176270b0a4168ef73d12f9e /include/sys
parent976c0fdcb55fafc55682d86441e5293d8aa5259d (diff)
downloadmusl-9448b0513e2eec020fbca9c10412b83df5027a16.tar.gz
musl-9448b0513e2eec020fbca9c10412b83df5027a16.tar.xz
musl-9448b0513e2eec020fbca9c10412b83df5027a16.zip
refactor headers, especially alltypes.h, and improve C++ ABI compat
the arch-specific bits/alltypes.h.sh has been replaced with a generic
alltypes.h.in and minimal arch-specific bits/alltypes.h.in.

this commit is intended to have no functional changes except:
- exposing additional symbols that POSIX allows but does not require
- changing the C++ name mangling for some types
- fixing the signedness of blksize_t on powerpc (POSIX requires signed)
- fixing the limit macros for sig_atomic_t on x86_64
- making dev_t an unsigned type (ABI matching goal, and more logical)

in addition, some types that were wrongly defined with long on 32-bit
archs were changed to int, and vice versa; this change is
non-functional except for the possibility of making pointer types
mismatch, and only affects programs that were using them incorrectly,
and only at build-time, not runtime.

the following changes were made in the interest of moving
non-arch-specific types out of the alltypes system and into the
headers they're associated with, and also will tend to improve
application compatibility:
- netdb.h now includes netinet/in.h (for socklen_t and uint32_t)
- netinet/in.h now includes sys/socket.h and inttypes.h
- sys/resource.h now includes sys/time.h (for struct timeval)
- sys/wait.h now includes signal.h (for siginfo_t)
- langinfo.h now includes nl_types.h (for nl_item)

for the types in stdint.h:
- types which are of no interest to other headers were moved out of
  the alltypes system.
- fast types for 8- and 64-bit are hard-coded (at least for now); only
  the 16- and 32-bit ones have reason to vary by arch.

and the following types have been changed for C++ ABI purposes;
- mbstate_t now has a struct tag, __mbstate_t
- FILE's struct tag has been changed to _IO_FILE
- DIR's struct tag has been changed to __dirstream
- locale_t's struct tag has been changed to __locale_struct
- pthread_t is defined as unsigned long in C++ mode only
- fpos_t now has a struct tag, _G_fpos64_t
- fsid_t's struct tag has been changed to __fsid_t
- idtype_t has been made an enum type (also required by POSIX)
- nl_catd has been changed from long to void *
- siginfo_t's struct tag has been removed
- sigset_t's has been given a struct tag, __sigset_t
- stack_t has been given a struct tag, sigaltstack
- suseconds_t has been changed to long on 32-bit archs
- [u]intptr_t have been changed from long to int rank on 32-bit archs
- dev_t has been made unsigned

summary of tests that have been performed against these changes:
- nsz's libc-test (diff -u before and after)
- C++ ABI check symbol dump (diff -u before, after, glibc)
- grepped for __NEED, made sure types needed are still in alltypes
- built gcc 3.4.6
Diffstat (limited to 'include/sys')
-rw-r--r--include/sys/resource.h3
-rw-r--r--include/sys/statfs.h2
-rw-r--r--include/sys/types.h10
-rw-r--r--include/sys/wait.h11
4 files changed, 10 insertions, 16 deletions
diff --git a/include/sys/resource.h b/include/sys/resource.h
index ff8ee205..0cfbcf44 100644
--- a/include/sys/resource.h
+++ b/include/sys/resource.h
@@ -6,10 +6,9 @@ extern "C" {
 #endif
 
 #include <features.h>
+#include <sys/time.h>
 
 #define __NEED_id_t
-#define __NEED_time_t
-#define __NEED_struct_timeval
 
 #ifdef _GNU_SOURCE
 #define __NEED_pid_t
diff --git a/include/sys/statfs.h b/include/sys/statfs.h
index d8128a25..6f4c6230 100644
--- a/include/sys/statfs.h
+++ b/include/sys/statfs.h
@@ -9,7 +9,7 @@ extern "C" {
 
 #include <sys/statvfs.h>
 
-typedef struct {
+typedef struct __fsid_t {
 	int __val[2];
 } fsid_t;
 
diff --git a/include/sys/types.h b/include/sys/types.h
index 6ead8b6e..db8661bf 100644
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -25,10 +25,6 @@ extern "C" {
 #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
@@ -57,9 +53,9 @@ extern "C" {
 #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 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;
diff --git a/include/sys/wait.h b/include/sys/wait.h
index b8d6432e..b6dfe01d 100644
--- a/include/sys/wait.h
+++ b/include/sys/wait.h
@@ -10,10 +10,13 @@ extern "C" {
 
 #define __NEED_pid_t
 #define __NEED_id_t
-#define __NEED_siginfo_t
 #include <bits/alltypes.h>
 
-typedef int idtype_t;
+typedef enum {
+	P_ALL = 0,
+	P_PID = 1,
+	P_PGID = 2
+} idtype_t;
 
 pid_t wait (int *);
 int waitid (idtype_t, id_t, siginfo_t *, int);
@@ -37,10 +40,6 @@ pid_t wait4 (pid_t, int *, int, struct rusage *);
 #define __WALL      0x40000000
 #define __WCLONE    0x80000000
 
-#define P_ALL  0
-#define P_PID  1
-#define P_PGID 2
-
 #define WEXITSTATUS(s) (((s) & 0xff00) >> 8)
 #define WTERMSIG(s) ((s) & 0x7f)
 #define WSTOPSIG(s) WEXITSTATUS(s)