Fix up Makefiles, and fix include issues compiling with gcc

diff --git a/contrib/pzstd/Makefile b/contrib/pzstd/Makefile
index ba86f5d4d6a1ea4298aa34dff1c81cb2b0f25cc8..2ef10b6ef2c5cfb814347f808bc276a2023e06b9 100644 (file)
--- a/contrib/pzstd/Makefile
+++ b/contrib/pzstd/Makefile
@@ -11,12 +11,10 @@ ZSTDDIR = ../../lib
 PROGDIR = ../../programs
 
 CPPFLAGS = -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/dictBuilder -I$(PROGDIR) -I.
-CFLAGS  ?= -O3
-CFLAGS  += -Wall -Wextra -Wcast-qual -Wcast-align -Wstrict-aliasing=1 \
-           -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -Wundef \
-                                       -std=c++11
-CFLAGS  += $(MOREFLAGS)
-FLAGS    = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
+CXXFLAGS  ?= -O3
+CXXFLAGS  += -std=c++11
+CXXFLAGS  += $(MOREFLAGS)
+FLAGS    = $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
 
 
 ZSTDCOMMON_FILES := $(ZSTDDIR)/common/*.c

diff --git a/contrib/pzstd/Options.cpp b/contrib/pzstd/Options.cpp
index dc6aeef1461914eb6fa151ecaf3e020b9e1ebace..693e9a515f5ca233df8c9329a8e7b47925abd2f2 100644 (file)
--- a/contrib/pzstd/Options.cpp
+++ b/contrib/pzstd/Options.cpp
@@ -9,6 +9,7 @@
 #include "Options.h"
 
 #include <cstdio>
+#include <cstring>
 
 namespace pzstd {
 

diff --git a/contrib/pzstd/test/Makefile b/contrib/pzstd/test/Makefile
index 147d9bd79527c830ecd1cdcf1e097bceddbe39da..5f0e144e9ee3f8a1250ded7363a1ddf32081cdb0 100644 (file)
--- a/contrib/pzstd/test/Makefile
+++ b/contrib/pzstd/test/Makefile
@@ -24,10 +24,10 @@ GTEST_LIB ?= -L $(PZSTDDIR)/googletest/build/googlemock/gtest
 
 CPPFLAGS = -I$(PZSTDDIR) $(GTEST_INC) $(GTEST_LIB) -I$(ZSTDDIR)/common -I$(PROGDIR)
 
-CFLAGS  ?= -O3
-CFLAGS  += -std=c++11
-CFLAGS  += $(MOREFLAGS)
-FLAGS    = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
+CXXFLAGS  ?= -O3
+CXXFLAGS  += -std=c++11
+CXXFLAGS  += $(MOREFLAGS)
+FLAGS    = $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
 
 datagen.o: $(PROGDIR)/datagen.*
        $(CXX) $(FLAGS) $(PROGDIR)/datagen.c -c -o $@

diff --git a/contrib/pzstd/utils/Range.h b/contrib/pzstd/utils/Range.h
index 3df15976d21aeef101c2925016e54ef67c3efdf3..111e98f588130bb53a4d1adebb1f1c0f5ec5e05a 100644 (file)
--- a/contrib/pzstd/utils/Range.h
+++ b/contrib/pzstd/utils/Range.h
@@ -16,6 +16,7 @@
 #include "utils/Likely.h"
 
 #include <cstddef>
+#include <cstring>
 #include <stdexcept>
 #include <string>
 #include <type_traits>

diff --git a/contrib/pzstd/utils/test/Makefile b/contrib/pzstd/utils/test/Makefile
index 6f801c309c02f1e3f559f588cbeb0bee9b5a7c83..16b89804b87b85ddb1bab168809055ecb6876adc 100644 (file)
--- a/contrib/pzstd/utils/test/Makefile
+++ b/contrib/pzstd/utils/test/Makefile
@@ -21,10 +21,10 @@ GTEST_INC ?= -isystem $(PZSTDDIR)/googletest/googletest/include
 GTEST_LIB ?= -L $(PZSTDDIR)/googletest/build/googlemock/gtest
 
 CPPFLAGS = -I$(PZSTDDIR) $(GTEST_INC) $(GTEST_LIB)
-CFLAGS  ?= -O3
-CFLAGS  += -std=c++11
+CXXFLAGS  ?= -O3
+CXXFLAGS  += -std=c++11
 CFLAGS  += $(MOREFLAGS)
-FLAGS    = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
+FLAGS    = $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
 
 %: %.cpp
        $(CXX) $(FLAGS) -lgtest -lgtest_main $^ -o $@$(EXT)