From ad68a0e5f707bafc02955828f0bd74d60549d92c Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Thu, 26 Feb 2015 00:29:15 +0100 Subject: [PATCH] "type redef fix" for gcc <= 4.4 --- lib/fse.c | 3 +++ lib/zstd.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/fse.c b/lib/fse.c index 798ea266d..e07b951cd 100644 --- 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 e81e63309..c8eed5a3e 100644 --- a/lib/zstd.c +++ b/lib/zstd.c @@ -68,9 +68,6 @@ #include /* 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 -- 2.47.2