summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorYann Collet <cyan@fb.com>2016-11-19 01:54:26 (GMT)
committerYann Collet <cyan@fb.com>2016-11-19 01:56:56 (GMT)
commit19df3029e234e4c48c31377c9ef5f7c940da5106 (patch)
tree3ee2bd09200f75f321b98a2ddc60f1aaa2343347 /lib
parent519932afaf5a1d85e5d39de4acebc0a6bc07b9e3 (diff)
downloadlz4-19df3029e234e4c48c31377c9ef5f7c940da5106.zip
lz4-19df3029e234e4c48c31377c9ef5f7c940da5106.tar.gz
lz4-19df3029e234e4c48c31377c9ef5f7c940da5106.tar.bz2
fixed #272 (compilation fails on gcc 4.4), reported by @totaam
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile4
-rw-r--r--lib/lz4.h5
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 216d136..d6e3668 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -46,7 +46,7 @@ DESTDIR?=
PREFIX ?= /usr/local
CPPFLAGS= -DXXH_NAMESPACE=LZ4_
CFLAGS ?= -O3
-CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
+CFLAGS += -g -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
-Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -Wundef \
-Wpointer-arith -Wstrict-aliasing=1
CFLAGS += $(MOREFLAGS)
@@ -102,7 +102,7 @@ else
endif
clean:
- @$(RM) core *.o *.a *.$(SHARED_EXT) *.$(SHARED_EXT).* liblz4.pc dll/liblz4.dll dll/liblz4.lib
+ @$(RM) core *.o *.a *.$(SHARED_EXT) liblz4.pc dll/liblz4.dll dll/liblz4.lib
@echo Cleaning library completed
diff --git a/lib/lz4.h b/lib/lz4.h
index ec758fe..49854e4 100644
--- a/lib/lz4.h
+++ b/lib/lz4.h
@@ -412,9 +412,10 @@ union LZ4_streamDecode_u {
#ifdef LZ4_DISABLE_DEPRECATE_WARNINGS
# define LZ4_DEPRECATED(message) /* disable deprecation warnings */
#else
-# if (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__)
+# define LZ4_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
+# if (LZ4_GCC_VERSION >= 405) || defined(__clang__)
# define LZ4_DEPRECATED(message) __attribute__((deprecated(message)))
-# elif defined(__GNUC__) && (__GNUC__ >= 3)
+# elif (LZ4_GCC_VERSION >= 301)
# define LZ4_DEPRECATED(message) __attribute__((deprecated))
# elif defined(_MSC_VER)
# define LZ4_DEPRECATED(message) __declspec(deprecated(message))