Update to musl 1.2.2.

[wasi-libc.git] / libc-top-half / musl / src / time / __tz.c

diff --git a/libc-top-half/musl/src/time/__tz.c b/libc-top-half/musl/src/time/__tz.c
index 383d05ec342ea0a3354ed27333cd31ca67d77ac2..092d343df3300bb605222ff194ed72dbd4b1287d 100644 (file)
--- a/libc-top-half/musl/src/time/__tz.c
+++ b/libc-top-half/musl/src/time/__tz.c
@@ -8,6 +8,12 @@
 #endif
 #include "libc.h"
 #include "lock.h"
+#include "fork_impl.h"
+
+#define malloc __libc_malloc
+#define calloc undef
+#define realloc undef
+#define free undef
 
 #ifdef __wasilibc_unmodified_upstream // timezone data
 long  __timezone = 0;
@@ -35,6 +41,7 @@ static char *old_tz = old_tz_buf;
 static size_t old_tz_size = sizeof old_tz_buf;
 
 static volatile int lock[1];
+volatile int *const __timezone_lockptr = lock;
 
 static int getint(const char **p)
 {
@@ -183,7 +190,7 @@ static void do_tzset()
        zi = map;
        if (map) {
                int scale = 2;
-               if (sizeof(time_t) > 4 && map[4]=='2') {
+               if (map[4]!='1') {
                        size_t skip = zi_dotprod(zi+20, VEC(1,1,8,5,6,1), 6);
                        trans = zi+skip+44+44;
                        scale++;