Merge remote-tracking branch 'upstream/master' into opensource

ykt66 · Dec 8, 2016 · 1d21e98 · 1d21e98
2 parents 69afa4f + be70432
commit 1d21e98
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/unit-test/Makefile b/unit-test/Makefile
@@ -22,7 +22,7 @@ include depends.mk
 CXX=g++
 INCPATH=-I. -I../src -I$(BOOST_HEADER_DIR) -I$(PROTOBUF_DIR)/include \
 		-I$(SNAPPY_DIR)/include -I$(ZLIB_DIR)/include -I$(GTEST_DIR)/include
-CXXFLAGS += $(OPT) -pipe -W -Wall -fPIC -D_GNU_SOURCE -D__STDC_LIMIT_MACROS -Dprivate=public $(INCPATH)
+CXXFLAGS += $(OPT) -pipe -W -Wall -fPIC -D_GNU_SOURCE -D__STDC_LIMIT_MACROS -fno-access-control $(INCPATH)
 
 LDFLAGS += -L.. -L$(ZLIB_DIR)/lib -L$(PROTOBUF_DIR)/lib/ -L$(SNAPPY_DIR)/lib/ -lsofa-pbrpc -lprotobuf -lsnappy -lpthread -lz
 ifeq ($(OS),Windows_NT)