rework langinfo code for ABI compat and for use by time code

[musl] / src / internal / libc.h

diff --git a/src/internal/libc.h b/src/internal/libc.h
index f88d846..c8fbe3f 100644 (file)
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -9,9 +9,6 @@ struct __libc {
        int threaded;
        int secure;
        size_t *auxv;
-       int (*atexit)(void (*)(void));
-       void (*fini)(void);
-       void (*ldso_fini)(void);
        volatile int threads_minus_1;
        int canceldisable;
        FILE *ofl_head;
@@ -21,13 +18,13 @@ struct __libc {
 
 extern size_t __hwcap;
 
-#if !defined(__PIC__) || 100*__GNUC__+__GNUC_MINOR__ >= 303 || defined(__PCC__) || defined(__TINYC__)
+#if !defined(__PIC__) || (100*__GNUC__+__GNUC_MINOR__ >= 303 && !defined(__PCC__))
 
 #ifdef __PIC__
 #if __GNUC__ < 4
 #define BROKEN_VISIBILITY 1
 #endif
-#define ATTR_LIBC_VISIBILITY __attribute__((visibility("hidden"))) 
+#define ATTR_LIBC_VISIBILITY __attribute__((visibility("hidden")))
 #else
 #define ATTR_LIBC_VISIBILITY
 #endif
@@ -46,10 +43,10 @@ extern struct __libc *__libc_loc(void) __attribute__((const));
 
 
 /* Designed to avoid any overhead in non-threaded processes */
-void __lock(volatile int *);
-void __unlock(volatile int *);
-int __lockfile(FILE *);
-void __unlockfile(FILE *);
+void __lock(volatile int *) ATTR_LIBC_VISIBILITY;
+void __unlock(volatile int *) ATTR_LIBC_VISIBILITY;
+int __lockfile(FILE *) ATTR_LIBC_VISIBILITY;
+void __unlockfile(FILE *) ATTR_LIBC_VISIBILITY;
 #define LOCK(x) (libc.threads_minus_1 ? (__lock(x),1) : ((void)(x),1))
 #define UNLOCK(x) (libc.threads_minus_1 ? (__unlock(x),1) : ((void)(x),1))
 
@@ -57,7 +54,6 @@ void __synccall(void (*)(void *), void *);
 int __setxid(int, int, int, int);
 
 extern char **__environ;
-#define environ __environ
 
 #undef weak_alias
 #define weak_alias(old, new) \