Page MenuHomeFreeBSD
Files F163367624

D34238.id102589.diff
No OneTemporary
Actions

D34238.id102589.diff
View Options

Index: sys/contrib/zstd/programs/timefn.h
===================================================================
--- sys/contrib/zstd/programs/timefn.h
+++ sys/contrib/zstd/programs/timefn.h
@@ -57,8 +57,9 @@
/* C11 requires timespec_get, but FreeBSD 11 lacks it, while still claiming C11 compliance.
Android also lacks it but does define TIME_UTC. */
-#elif (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */) \
- && defined(TIME_UTC) && !defined(__ANDROID__)
+#elif defined(FORCE_C11_TIMERS) || \
+ ((defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */) \
+ && defined(TIME_UTC) && !defined(__ANDROID__))
typedef struct timespec UTIL_time_t;
#define UTIL_TIME_INITIALIZER { 0, 0 }
Index: sys/contrib/zstd/programs/timefn.c
===================================================================
--- sys/contrib/zstd/programs/timefn.c
+++ sys/contrib/zstd/programs/timefn.c
@@ -84,8 +84,9 @@
/* C11 requires timespec_get, but FreeBSD 11 lacks it, while still claiming C11 compliance.
Android also lacks it but does define TIME_UTC. */
-#elif (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */) \
- && defined(TIME_UTC) && !defined(__ANDROID__)
+#elif defined(FORCE_C11_TIMERS) || \
+ ((defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */) \
+ && defined(TIME_UTC) && !defined(__ANDROID__))
#include <stdlib.h> /* abort */
#include <stdio.h> /* perror */
Index: usr.bin/zstd/Makefile
===================================================================
--- usr.bin/zstd/Makefile
+++ usr.bin/zstd/Makefile
@@ -18,7 +18,8 @@
-I${SRCTOP}/sys/contrib/zstd/lib \
-DXXH_NAMESPACE=ZSTD_ \
-DHAVE_THREAD=1 \
- -DZSTD_MULTITHREAD=1
+ -DZSTD_MULTITHREAD=1 \
+ -DFORCE_C11_TIMERS=1
LINKS= ${BINDIR}/zstd ${BINDIR}/unzstd \
${BINDIR}/zstd ${BINDIR}/zstdcat \
${BINDIR}/zstd ${BINDIR}/zstdmt

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 23, 1:56 PM (3 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35404200
Default Alt Text
D34238.id102589.diff (1 KB)

Event Timeline