Rerun configure
$ git clean -dxf
$ ./autogen.sh
$ ./configure
$ cp config.h config/config.h
$ cp config.h android/config.h
Bug: 117607748
Test: m checkbuild
Change-Id: I7eac63702beb89734387daa47e6fd1c300030cee
diff --git a/config/config.h b/config/config.h
index 366aa84..79219e4 100644
--- a/config/config.h
+++ b/config/config.h
@@ -5,16 +5,19 @@
#define HASH_MAP_CLASS unordered_map
/* the location of <unordered_map> or <hash_map> */
-#define HASH_MAP_H <tr1/unordered_map>
+#define HASH_MAP_H <unordered_map>
/* the namespace of hash_map/hash_set */
-#define HASH_NAMESPACE std::tr1
+#define HASH_NAMESPACE std
/* the name of <hash_set> */
#define HASH_SET_CLASS unordered_set
/* the location of <unordered_set> or <hash_set> */
-#define HASH_SET_H <tr1/unordered_set>
+#define HASH_SET_H <unordered_set>
+
+/* define if the compiler supports basic C++11 syntax */
+#define HAVE_CXX11 1
/* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1
@@ -49,6 +52,9 @@
/* Define if you have POSIX threads libraries and header files. */
#define HAVE_PTHREAD 1
+/* Have PTHREAD_PRIO_INHERIT. */
+#define HAVE_PTHREAD_PRIO_INHERIT 1
+
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
@@ -82,8 +88,7 @@
/* Enable classes using zlib compression. */
#define HAVE_ZLIB 1
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
#define LT_OBJDIR ".libs/"
/* Name of package */
@@ -96,7 +101,7 @@
#define PACKAGE_NAME "Protocol Buffers"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Protocol Buffers 2.6.1"
+#define PACKAGE_STRING "Protocol Buffers 3.9.1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "protobuf"
@@ -105,15 +110,12 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.6.1"
+#define PACKAGE_VERSION "3.9.1"
/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
/* #undef PTHREAD_CREATE_JOINABLE */
-/* 64bit enabled */
-/* #undef SOLARIS_64BIT_ENABLED */
-
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
@@ -140,7 +142,7 @@
/* Version number of package */
-#define VERSION "2.6.1"
+#define VERSION "3.9.1"
/* Define to 1 if on MINIX. */
/* #undef _MINIX */
