From: Carl Woffenden <cwoffenden@gmail.com>
Date: Thu, 29 Aug 2019 09:16:57 +0000 (+0200)
Subject: C99 and older GCC fixes
X-Git-Tag: v1.4.4~1^2~67^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72e51ac24677adb724d8c0ef5df949c6e2264d78;p=thirdparty%2Fzstd.git

C99 and older GCC fixes
---

diff --git a/contrib/declib/examples/simple.c b/contrib/declib/examples/simple.c
index cdd6855eb..58f37737c 100644
--- a/contrib/declib/examples/simple.c
+++ b/contrib/declib/examples/simple.c
@@ -9,6 +9,7 @@
  */
  
 #include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/contrib/declib/zstddeclib-in.c b/contrib/declib/zstddeclib-in.c
index 240f14cb0..5b38eae73 100755
--- a/contrib/declib/zstddeclib-in.c
+++ b/contrib/declib/zstddeclib-in.c
@@ -45,8 +45,12 @@
  * 
  * Note: It's important that none of these affects 'zstd.h' (only the
  * implementation files we're amalgamating).
+ * 
+ * Note: MEM_MODULE stops xxhash redefining BYTE, U16, etc., which are also
+ * defined in mem.h (breaking C99 compatibility).
  */
 #define DEBUGLEVEL 0
+#define MEM_MODULE
 #define XXH_NAMESPACE ZSTD_
 #define XXH_PRIVATE_API
 #define XXH_INLINE_ALL