Makefile: -Wno-unused-parameter for older g++

diff --git a/Makefile b/Makefile
index b295502099674d1ff823b3e724dced1182ee5d17..08d7a842726345b39941a8ea775e8ac6e632dd8c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -27,8 +27,10 @@ COMMON_FLAGS += -O2 -c \
        -Wall -Wextra -Werror \
        -Ikafel/include
 
-CFLAGS += $(COMMON_FLAGS) -std=gnu11
-CXXFLAGS += $(COMMON_FLAGS) $(shell pkg-config --cflags protobuf) -std=c++11 -Wno-unused
+CFLAGS += $(COMMON_FLAGS) \
+       -std=gnu11
+CXXFLAGS += $(COMMON_FLAGS) $(shell pkg-config --cflags protobuf) \
+       -std=c++11 -Wno-unused -Wno-unused-parameter
 LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie -Wl,-z,noexecstack -lpthread -lcap $(shell pkg-config --libs protobuf)
 
 BIN = nsjail
@@ -111,5 +113,4 @@ user.o: user.h common.h log.h subproc.h util.h
 util.o: util.h common.h log.h
 uts.o: uts.h common.h log.h
 cpu.o: cpu.h common.h log.h util.h
-config.o: common.h caps.h config.h log.h mount.h user.h util.h config.pb.h
-config.pb.o: config.pb.h
+config.o: common.h caps.h config.h log.h mount.h user.h util.h

diff --git a/contain.h b/contain.h
index 31c871484107992321a32c756444e3330d0f3d7d..edba108cc362850dd01c305132d0457356fea549 100644 (file)
--- a/contain.h
+++ b/contain.h
@@ -26,7 +26,7 @@
 
 #include "common.h"
 
-bool containSetupFD(struct nsjconf_t * nsjconf, int fd_in, int fd_out, int fd_err);
+bool containSetupFD(struct nsjconf_t *nsjconf, int fd_in, int fd_out, int fd_err);
 bool containContain(struct nsjconf_t *nsjconf);
 
 #endif                         /* NS_CONTAIN_H */