summaryrefslogtreecommitdiff
path: root/src
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 /src
parent976c0fdcb55fafc55682d86441e5293d8aa5259d (diff)
downloadmusl-9448b0513e2eec020fbca9c10412b83df5027a16.tar.gz
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 'src')
-rw-r--r--src/dirent/__dirent.h2
-rw-r--r--src/internal/locale_impl.h2
-rw-r--r--src/internal/stdio_impl.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/dirent/__dirent.h b/src/dirent/__dirent.h
index 38a27b06..45509e19 100644
--- a/src/dirent/__dirent.h
+++ b/src/dirent/__dirent.h
@@ -1,4 +1,4 @@
-struct __DIR_s
+struct __dirstream
{
int fd;
off_t tell;
diff --git a/src/internal/locale_impl.h b/src/internal/locale_impl.h
index c268124f..f41c6f24 100644
--- a/src/internal/locale_impl.h
+++ b/src/internal/locale_impl.h
@@ -1,5 +1,5 @@
#include <locale.h>
-struct __locale {
+struct __locale_struct {
int dummy;
};
diff --git a/src/internal/stdio_impl.h b/src/internal/stdio_impl.h
index c9d20fac..2083b2fe 100644
--- a/src/internal/stdio_impl.h
+++ b/src/internal/stdio_impl.h
@@ -18,7 +18,7 @@
#define F_ERR 32
#define F_SVB 64
-struct __FILE_s {
+struct _IO_FILE {
unsigned flags;
unsigned char *rpos, *rend;
int (*close)(FILE *);