"type redef fix" for gcc <= 4.4

diff --git a/lib/fse.c b/lib/fse.c
index 798ea266d8294bb2310ec6d360255318819effb3..e07b951cdec4d69facdb9466501c6f526e0b8885 100644 (file)
--- a/lib/fse.c
+++ b/lib/fse.c
@@ -87,6 +87,8 @@
 #include "fse_static.h"
 
 
+#ifndef MEM_ACCESS_MODULE
+#define MEM_ACCESS_MODULE
 /****************************************************************
 *  Basic Types
 *****************************************************************/
@@ -109,6 +111,7 @@ typedef unsigned long long  U64;
 typedef   signed long long  S64;
 #endif
 
+#endif   /* MEM_ACCESS_MODULE */
 
 /****************************************************************
 *  Memory I/O

diff --git a/lib/zstd.c b/lib/zstd.c
index e81e633091252e69d7ad13256b0a965e1825f02e..c8eed5a3ea20ac039f2d7236c79b77229db72589 100644 (file)
--- a/lib/zstd.c
+++ b/lib/zstd.c
@@ -68,9 +68,6 @@
 #include <stdio.h>       /* debug : printf */
 #include "zstd_static.h"
 #if defined(__clang__) || defined(__GNUC__)
-#  ifdef __clang__
-#    pragma clang diagnostic ignored "-Wtypedef-redefinition"
-#  endif
 #  include "fse.c"       /* due to GCC/Clang inlining limitations, including *.c runs noticeably faster */
 #else
 #  include "fse_static.h"
@@ -99,6 +96,8 @@
 #endif
 
 
+#ifndef MEM_ACCESS_MODULE
+#define MEM_ACCESS_MODULE
 /********************************************************
 *  Basic Types
 *********************************************************/
@@ -119,6 +118,8 @@ typedef   signed int        S32;
 typedef unsigned long long  U64;
 #endif
 
+#endif   /* MEM_ACCESS_MODULE */
+
 
 /********************************************************
 *  Constants