add missing 'void' in prototypes of internal pthread functions

[musl] / src / time / clock_gettime.c

diff --git a/src/time/clock_gettime.c b/src/time/clock_gettime.c
index ad5c09d..1572de0 100644 (file)
--- a/src/time/clock_gettime.c
+++ b/src/time/clock_gettime.c
@@ -3,6 +3,7 @@
 #include <stdint.h>
 #include "syscall.h"
 #include "libc.h"
+#include "atomic.h"
 
 static int sc_clock_gettime(clockid_t clk, struct timespec *ts)
 {
@@ -10,7 +11,7 @@ static int sc_clock_gettime(clockid_t clk, struct timespec *ts)
        if (!r) return r;
        if (r == -ENOSYS) {
                if (clk == CLOCK_REALTIME) {
-                       __syscall(SYS_gettimeofday, clk, ts, 0);
+                       __syscall(SYS_gettimeofday, ts, 0);
                        ts->tv_nsec = (int)ts->tv_nsec * 1000;
                        return 0;
                }
@@ -20,14 +21,21 @@ static int sc_clock_gettime(clockid_t clk, struct timespec *ts)
        return -1;
 }
 
-weak_alias(sc_clock_gettime, __vdso_clock_gettime);
-
-int (*__cgt)(clockid_t, struct timespec *) = __vdso_clock_gettime;
+void *__vdsosym(const char *, const char *);
 
 int __clock_gettime(clockid_t clk, struct timespec *ts)
 {
-       /* Conditional is to make this work prior to dynamic linking */
-       return __cgt ? __cgt(clk, ts) : sc_clock_gettime(clk, ts);
+#ifdef VDSO_CGT_SYM
+       static int (*volatile cgt)(clockid_t, struct timespec *);
+       if (!cgt) {
+               void *f = __vdsosym(VDSO_CGT_VER, VDSO_CGT_SYM);
+               if (!f) f = (void *)sc_clock_gettime;
+               a_cas_p(&cgt, 0, f);
+       }
+       return cgt(clk, ts);
+#else
+       return sc_clock_gettime(clk, ts);
+#endif
 }
 
 weak_alias(__clock_gettime, clock_gettime);