define NULL as nullptr when used in C++11 or later

[musl] / src / internal / libc.h

diff --git a/src/internal/libc.h b/src/internal/libc.h
index 7307a73..619bba8 100644 (file)
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -8,7 +8,7 @@
 struct __locale_map;
 
 struct __locale_struct {
-       const struct __locale_map *volatile cat[6];
+       const struct __locale_map *cat[6];
 };
 
 struct tls_module {
@@ -18,10 +18,11 @@ struct tls_module {
 };
 
 struct __libc {
-       int can_do_threads;
-       int threaded;
-       int secure;
-       volatile int threads_minus_1;
+       char can_do_threads;
+       char threaded;
+       char secure;
+       volatile signed char need_locks;
+       int threads_minus_1;
        size_t *auxv;
        struct tls_module *tls_head;
        size_t tls_size, tls_align, tls_cnt;
@@ -33,37 +34,25 @@ struct __libc {
 #define PAGE_SIZE libc.page_size
 #endif
 
-#define weak __attribute__((__weak__))
-#define hidden __attribute__((__visibility__("hidden")))
-
 extern hidden struct __libc __libc;
 #define libc __libc
 
+hidden void __init_libc(char **, char *);
+hidden void __init_tls(size_t *);
+hidden void __init_ssp(void *);
+hidden void __libc_start_init(void);
+hidden void __funcs_on_exit(void);
+hidden void __funcs_on_quick_exit(void);
+hidden void __libc_exit_fini(void);
+hidden void __fork_handler(int);
+
 extern hidden size_t __hwcap;
 extern hidden size_t __sysinfo;
 extern char *__progname, *__progname_full;
 
-/* Designed to avoid any overhead in non-threaded processes */
-hidden void __lock(volatile int *);
-hidden void __unlock(volatile int *);
-hidden int __lockfile(FILE *);
-hidden void __unlockfile(FILE *);
-#define LOCK(x) __lock(x)
-#define UNLOCK(x) __unlock(x)
-
-void __synccall(void (*)(void *), void *);
-int __setxid(int, int, int, int);
-
-extern char **__environ;
-
-#undef weak_alias
-#define weak_alias(old, new) \
-       extern __typeof(old) new __attribute__((__weak__, __alias__(#old)))
-
-#undef LFS64_2
-#define LFS64_2(x, y) weak_alias(x, y)
+extern hidden const char __libc_version[];
 
-#undef LFS64
-#define LFS64(x) LFS64_2(x, x##64)
+hidden void __synccall(void (*)(void *), void *);
+hidden int __setxid(int, int, int, int);
 
 #endif