C99 and older GCC fixes

diff --git a/contrib/declib/examples/simple.c b/contrib/declib/examples/simple.c
index cdd6855ebd454fad3f897bd2f4dae57db894c97b..58f37737cac69f4b626c7dd0d59cc6e3f6da2b0b 100644 (file)
--- 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 240f14cb0cb25c1088514ec036270cbbf56e1bd7..5b38eae73b6c73e616efdc190be143ad2b646b89 100755 (executable)
--- 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