aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/stubs/common.cc
diff options
context:
space:
mode:
authorGravatar Jisi Liu <jisi.liu@gmail.com>2015-06-12 15:49:21 -0700
committerGravatar Jisi Liu <jisi.liu@gmail.com>2015-06-16 18:27:36 -0700
commit78d470c7a50d3788bf3f819eba99597aea43674f (patch)
treef2d0c53ce1a94234cc4994ea319f1560f44b2f96 /src/google/protobuf/stubs/common.cc
parent4cbb612299eaf8259db25f5dcda46022fbd1db54 (diff)
Make the code independent of config.h
Now the Build tool needs to define -DHAVE_ZLIB and -DHAVE-PTHREAD rather than providing a config.h - Make pbconfig.h a manually written file to handle hash conditions according to platform related macros. - Remove #include "config.h" from source code. - Changed the configure.ac and Makefile.am to pass down the macros. - Change cmake to pass down the the macros. Change-Id: I537249d5df8fdeba189706aec436d1ab1104a4dc
Diffstat (limited to 'src/google/protobuf/stubs/common.cc')
-rw-r--r--src/google/protobuf/stubs/common.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/google/protobuf/stubs/common.cc b/src/google/protobuf/stubs/common.cc
index 54e00ccb..22cc5aa1 100644
--- a/src/google/protobuf/stubs/common.cc
+++ b/src/google/protobuf/stubs/common.cc
@@ -36,8 +36,6 @@
#include <errno.h>
#include <vector>
-#include "config.h"
-
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN // We only need minimal includes
#include <windows.h>