Get rid of unnecessary __MINGW32__, fix limb

quickjs-ng · Oct 6, 2024 · e1baab2 · e1baab2
1 parent 29d1cad
commit e1baab2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/cutils.c b/cutils.c
@@ -28,7 +28,7 @@
 #include <stdarg.h>
 #include <string.h>
 #include <time.h>
-#if !defined(_MSC_VER) || !__MINGW32__
+#if !defined(_MSC_VER)
 #include <sys/time.h>
 #endif
 
@@ -1129,7 +1129,7 @@ void rqsort(void *base, size_t nmemb, size_t size, cmp_f cmp, void *opaque)
 
 /*---- Portable time functions ----*/
 
-#if defined(_MSC_VER) || __MINGW32__
+#if defined(_MSC_VER)
  // From: https://stackoverflow.com/a/26085827
 static int gettimeofday_msvc(struct timeval *tp, struct timezone *tzp)
 {
@@ -1184,7 +1184,7 @@ uint64_t js__hrtime_ns(void) {
 
 int64_t js__gettimeofday_us(void) {
     struct timeval tv;
-#if defined(_MSC_VER) || __MINGW32__
+#if defined(_MSC_VER)
     gettimeofday_msvc(&tv, NULL);
 #else
     gettimeofday(&tv, NULL);

diff --git a/libbf.c b/libbf.c
@@ -1711,11 +1711,9 @@ static int __bf_div(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
 
         na = n + nb;
 
-#if !defined(_WIN32)
-        if (na >= (SIZE_MAX / sizeof(limb_t)) - 1) {
+        if (LIMB_LOG2_BITS == 6 && na >= (SIZE_MAX / sizeof(limb_t)) - 1) {
             return BF_ST_MEM_ERROR;  /* Return memory error status */
         }
-#endif
 
         taba = bf_malloc(s, (na + 1) * sizeof(limb_t));
         if (!taba)

diff --git a/quickjs-libc.c b/quickjs-libc.c
@@ -33,7 +33,7 @@
 #endif
 #include <errno.h>
 #include <fcntl.h>
-#if !defined(_MSC_VER) || !__MINGW32__
+#if !defined(_MSC_VER)
 #include <sys/time.h>
 #endif
 #include <time.h>

diff --git a/quickjs.c b/quickjs.c
@@ -30,7 +30,7 @@
 #include <inttypes.h>
 #include <string.h>
 #include <assert.h>
-#if !defined(_MSC_VER) || !__MINGW32__
+#if !defined(_MSC_VER)
 #include <sys/time.h>
 #if defined(_WIN32)
 #include <timezoneapi.h>