X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Ftime.c;h=7b4b167e7a825b0a7cc1703db54bc97b0c662dce;hb=dd54f9e004a0a83d1328e94648f48dcc27e0be5b;hp=716e7d8d39ea20f3556222014209f95e1f4745cd;hpb=020de3c04699323437f0c746fe986506b716ab97;p=sbcl.git

diff --git a/src/runtime/time.c b/src/runtime/time.c
index 716e7d8..7b4b167 100644
--- a/src/runtime/time.c
+++ b/src/runtime/time.c
@@ -15,21 +15,41 @@
 
 #include <stdio.h>
 #include <time.h>
+#include "sbcl.h"
 #include "runtime.h"
 
+#ifdef LISP_FEATURE_HPUX
+struct tm *gmtime_r(const time_t *timer, struct tm *result);
+struct tm *localtime_r(const time_t *timer, struct tm *result);
+#endif
+
 void get_timezone(time_t when, int *secwest, boolean *dst)
 {
     struct tm ltm, gtm;
     int sw;
 
+#ifdef LISP_FEATURE_WIN32
+    /* No _r versions on Windows, but the API documentation also
+     * doesn't warn them about being non-reentrant... So here's
+     * hoping they actually are -- once Windows grows threads
+     * this better be checked, though.
+     *
+     * The Windows versions also don't support times before the
+     * epoch, so we kludge it. */
+    if (when < 0)
+        when = 0;
     ltm = *localtime(&when);
     gtm = *gmtime(&when);
+#else
+    ltm = *localtime_r(&when, &ltm);
+    gtm = *gmtime_r(&when, &gtm);
+#endif
 
     sw = (((gtm.tm_hour*60)+gtm.tm_min)*60+gtm.tm_sec) - (((ltm.tm_hour*60)+ltm.tm_min)*60+ltm.tm_sec);
     if ((gtm.tm_wday + 1) % 7 == ltm.tm_wday)
-	sw -= 24*3600;
+        sw -= 24*3600;
     else if (gtm.tm_wday == (ltm.tm_wday + 1) % 7)
-	sw += 24*3600;
+        sw += 24*3600;
     *secwest = sw;
     *dst = ltm.tm_isdst;
 }