From: Yann Collet <cyan@fb.com>
Date: Wed, 10 Apr 2019 20:26:27 +0000 (-0700)
Subject: tried a blindfix for unix + c11
X-Git-Tag: v1.4.0^2~6^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b8185c7fc6d670927b1165141e2012cfcdbe702;p=thirdparty%2Fzstd.git

tried a blindfix for unix + c11
---

diff --git a/programs/platform.h b/programs/platform.h
index 1a8f97bc4..38ded8727 100644
--- a/programs/platform.h
+++ b/programs/platform.h
@@ -87,8 +87,8 @@ extern "C" {
  * The following list of build macros tries to "guess" if target OS is likely unix-like, and therefore can #include <unistd.h>
  */
 #  elif !defined(_WIN32) \
-     && (defined(__unix__) || defined(__unix) \
-     || defined(__midipix__) || defined(__VMS) || defined(__HAIKU__))
+     && ( defined(__unix__) || defined(__unix) \
+       || defined(__midipix__) || defined(__VMS) || defined(__HAIKU__) )
 
 #    if defined(__linux__) || defined(__linux)
 #      ifndef _POSIX_C_SOURCE
@@ -108,6 +108,7 @@ extern "C" {
 
 #endif   /* PLATFORM_POSIX_VERSION */
 
+
 /*-*********************************************
 *  Detect if isatty() and fileno() are available
 ************************************************/
diff --git a/programs/timefn.c b/programs/timefn.c
index ad2476958..efb8156b6 100644
--- a/programs/timefn.c
+++ b/programs/timefn.c
@@ -72,11 +72,8 @@ PTime UTIL_getSpanTimeNano(UTIL_time_t clockStart, UTIL_time_t clockEnd)
     return ((clockEnd - clockStart) * (PTime)rate.numer) / ((PTime)rate.denom);
 }
 
-#elif (PLATFORM_POSIX_VERSION >= 200112L) \
-   && (defined(__UCLIBC__)                \
-      || (defined(__GLIBC__)              \
-          && ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 17) \
-             || (__GLIBC__ > 2))))
+#elif (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */) \
+    && defined (CLOCK_MONOTONIC)
 
 UTIL_time_t UTIL_getTime(void)
 {
@@ -86,7 +83,7 @@ UTIL_time_t UTIL_getTime(void)
     return time;
 }
 
-UTIL_time_t UTIL_getSpanTime(UTIL_time_t begin, UTIL_time_t end)
+static UTIL_time_t UTIL_getSpanTime(UTIL_time_t begin, UTIL_time_t end)
 {
     UTIL_time_t diff;
     if (end.tv_nsec < begin.tv_nsec) {
diff --git a/programs/timefn.h b/programs/timefn.h
index 7892a6921..290da884e 100644
--- a/programs/timefn.h
+++ b/programs/timefn.h
@@ -35,9 +35,9 @@ extern "C" {
 
 #if !defined (__VMS) && (defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
 # include <stdint.h>
-  typedef uint64_t PTime;  /* Precise Time */
+  typedef uint64_t           PTime;  /* Precise Time */
 #else
-  typedef unsigned long long PTime;   /* does not support compilers without long long support */
+  typedef unsigned long long PTime;  /* does not support compilers without long long support */
 #endif
 
 
@@ -47,42 +47,35 @@ extern "C" {
 ******************************************/
 #if defined(_WIN32)   /* Windows */
 
-    #define UTIL_TIME_INITIALIZER { { 0, 0 } }
     typedef LARGE_INTEGER UTIL_time_t;
+    #define UTIL_TIME_INITIALIZER { { 0, 0 } }
 
 #elif defined(__APPLE__) && defined(__MACH__)
 
     #include <mach/mach_time.h>
-    #define UTIL_TIME_INITIALIZER 0
     typedef PTime UTIL_time_t;
+    #define UTIL_TIME_INITIALIZER 0
 
-#elif (PLATFORM_POSIX_VERSION >= 200112L) \
-   && (defined(__UCLIBC__)                \
-      || (defined(__GLIBC__)              \
-          && ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 17) \
-             || (__GLIBC__ > 2))))
+#elif (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */) \
+    && defined (CLOCK_MONOTONIC)
 
+    typedef struct timespec UTIL_time_t;   /* C11 defines struct timespes within time.h */
     #define UTIL_TIME_INITIALIZER { 0, 0 }
-    typedef struct timespec UTIL_freq_t;
-    typedef struct timespec UTIL_time_t;
 
-    UTIL_time_t UTIL_getSpanTime(UTIL_time_t begin, UTIL_time_t end);
-
-#else   /* relies on standard C (note : clock_t measurements can be wrong when using multi-threading) */
+#else   /* relies on standard C90 (note : clock_t measurements can be wrong when using multi-threading) */
 
     typedef clock_t UTIL_time_t;
     #define UTIL_TIME_INITIALIZER 0
 
 #endif
 
+
 UTIL_time_t UTIL_getTime(void);
 PTime UTIL_getSpanTimeMicro(UTIL_time_t clockStart, UTIL_time_t clockEnd);
 PTime UTIL_getSpanTimeNano(UTIL_time_t clockStart, UTIL_time_t clockEnd);
 
-
-#define SEC_TO_MICRO 1000000
+#define SEC_TO_MICRO ((PTime)1000000)
 PTime UTIL_clockSpanMicro(UTIL_time_t clockStart);
-
 PTime UTIL_clockSpanNano(UTIL_time_t clockStart);
 
 void UTIL_waitForNextTick(void);