Revert to using localtime() and rand()

Some platforms don't have localtime_r() and rand_r()

3 files changed, 2 insertions, 6 deletions

diff --git a/jim-clock.c b/jim-clock.c
index f771f71..51ffb51 100644
--- a/jim-clock.c
+++ b/jim-clock.c
@@ -26,7 +26,6 @@ static int clock_cmd_format(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
     char buf[100];
     time_t t;
     long seconds;
-    struct tm tm;
 
     const char *format = "%a %b  %d %H:%M:%S %Z %Y";
 
@@ -43,7 +42,7 @@ static int clock_cmd_format(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
     }
     t = seconds;
 
-    strftime(buf, sizeof(buf), format, localtime_r(&t, &tm));
+    strftime(buf, sizeof(buf), format, localtime(&t));
 
     Jim_SetResultString(interp, buf, -1);
 
diff --git a/jim-win32compat.h b/jim-win32compat.h
index 22a1502..dab0a01 100644
--- a/jim-win32compat.h
+++ b/jim-win32compat.h
@@ -14,8 +14,6 @@
 
 #define JIM_ANSIC
 #define MKDIR_ONE_ARG
-#define rand_r(S) ((void)(S), rand())
-#define localtime_r(T,TM) ((void)(TM), localtime(T))
 
 #define RTLD_LAZY 0
 void *dlopen(const char *path, int mode);
diff --git a/jim.c b/jim.c
index 526522c..483daf1 100644
--- a/jim.c
+++ b/jim.c
@@ -9294,11 +9294,10 @@ static void JimPrngInit(Jim_Interp *interp)
     int i;
     /* XXX: Move off stack */
     unsigned int seed[256];
-    unsigned rseed; /* uninitialized! */
 
     interp->prngState = Jim_Alloc(sizeof(Jim_PrngState));
     for (i = 0; i < 256; i++)
-        seed[i] = (rand_r(&rseed) ^ time(NULL) ^ clock());
+        seed[i] = (rand() ^ time(NULL) ^ clock());
     JimPrngSeed(interp, (unsigned char *)seed, sizeof(int) * 256);
 }