diff --git a/lib/libc/include/generic-musl/arpa/inet.h b/lib/libc/include/generic-musl/arpa/inet.h index 8adc584e14..87bcbd8e38 100644 --- a/lib/libc/include/generic-musl/arpa/inet.h +++ b/lib/libc/include/generic-musl/arpa/inet.h @@ -24,11 +24,6 @@ struct in_addr inet_makeaddr(in_addr_t, in_addr_t); in_addr_t inet_lnaof(struct in_addr); in_addr_t inet_netof(struct in_addr); -#undef INET_ADDRSTRLEN -#undef INET6_ADDRSTRLEN -#define INET_ADDRSTRLEN 16 -#define INET6_ADDRSTRLEN 46 - #ifdef __cplusplus } #endif diff --git a/lib/libc/include/generic-musl/netinet/in.h b/lib/libc/include/generic-musl/netinet/in.h index 87076c5c0e..e3bf81b8d3 100644 --- a/lib/libc/include/generic-musl/netinet/in.h +++ b/lib/libc/include/generic-musl/netinet/in.h @@ -60,8 +60,6 @@ struct ipv6_mreq { extern const struct in6_addr in6addr_any, in6addr_loopback; -#undef INET_ADDRSTRLEN -#undef INET6_ADDRSTRLEN #define INET_ADDRSTRLEN 16 #define INET6_ADDRSTRLEN 46 diff --git a/lib/libc/include/generic-musl/pthread.h b/lib/libc/include/generic-musl/pthread.h index e812c675c2..c31099ec7f 100644 --- a/lib/libc/include/generic-musl/pthread.h +++ b/lib/libc/include/generic-musl/pthread.h @@ -74,6 +74,9 @@ extern "C" { #define PTHREAD_BARRIER_SERIAL_THREAD (-1) +#define PTHREAD_NULL ((pthread_t)0) + + int pthread_create(pthread_t *__restrict, const pthread_attr_t *__restrict, void *(*)(void *), void *__restrict); int pthread_detach(pthread_t); _Noreturn void pthread_exit(void *); diff --git a/lib/libc/include/mips-linux-musl/bits/signal.h b/lib/libc/include/mips-linux-musl/bits/signal.h index f9a6ea657a..b35b14ea6a 100644 --- a/lib/libc/include/mips-linux-musl/bits/signal.h +++ b/lib/libc/include/mips-linux-musl/bits/signal.h @@ -93,7 +93,7 @@ typedef struct __ucontext { #define SIGTRAP 5 #define SIGABRT 6 #define SIGIOT SIGABRT -#define SIGSTKFLT 7 +#define SIGEMT 7 #define SIGFPE 8 #define SIGKILL 9 #define SIGBUS 10 diff --git a/lib/libc/include/mips64-linux-musl/bits/signal.h b/lib/libc/include/mips64-linux-musl/bits/signal.h index 82029cc2b4..444a192351 100644 --- a/lib/libc/include/mips64-linux-musl/bits/signal.h +++ b/lib/libc/include/mips64-linux-musl/bits/signal.h @@ -112,7 +112,7 @@ typedef struct __ucontext { #define SIGTRAP 5 #define SIGABRT 6 #define SIGIOT SIGABRT -#define SIGSTKFLT 7 +#define SIGEMT 7 #define SIGFPE 8 #define SIGKILL 9 #define SIGBUS 10 diff --git a/lib/libc/include/powerpc-linux-musl/bits/mman.h b/lib/libc/include/powerpc-linux-musl/bits/mman.h index 91dfed1e5a..2b30bf75b8 100644 --- a/lib/libc/include/powerpc-linux-musl/bits/mman.h +++ b/lib/libc/include/powerpc-linux-musl/bits/mman.h @@ -4,7 +4,6 @@ #define MAP_NORESERVE 0x40 #undef MAP_LOCKED #define MAP_LOCKED 0x80 -#undef MAP_SYNC #undef MCL_CURRENT #define MCL_CURRENT 0x2000 diff --git a/lib/libc/include/powerpc64-linux-musl/bits/mman.h b/lib/libc/include/powerpc64-linux-musl/bits/mman.h index 91dfed1e5a..2b30bf75b8 100644 --- a/lib/libc/include/powerpc64-linux-musl/bits/mman.h +++ b/lib/libc/include/powerpc64-linux-musl/bits/mman.h @@ -4,7 +4,6 @@ #define MAP_NORESERVE 0x40 #undef MAP_LOCKED #define MAP_LOCKED 0x80 -#undef MAP_SYNC #undef MCL_CURRENT #define MCL_CURRENT 0x2000