aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Muxi Yan <muxi@users.noreply.github.com>2019-01-03 10:10:13 -0800
committerGravatar GitHub <noreply@github.com>2019-01-03 10:10:13 -0800
commite761e56630c9ca976eb09bb53f3f69842a0f04fd (patch)
tree3949194d99bdb7990e5a84429cbfb8065a40db8a
parent8f5bda6de95f8948ab97084f2bbad6c6f5aec606 (diff)
parent6f083e112c509e4ef964b90eb1c3654033123878 (diff)
Merge pull request #17249 from muxi/16-to-32
Use 32 bit nanopb fields
-rw-r--r--CMakeLists.txt2
-rw-r--r--gRPC-Core.podspec2
-rw-r--r--setup.py2
-rw-r--r--templates/CMakeLists.txt.template2
-rw-r--r--templates/gRPC-Core.podspec.template2
5 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3ebb5d177..48d3d11d23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,7 +94,7 @@ endif()
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
-add_definitions(-DPB_FIELD_16BIT)
+add_definitions(-DPB_FIELD_32BIT)
if (MSVC)
include(cmake/msvc_static_runtime.cmake)
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index f873bc693b..240afbff7e 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -93,7 +93,7 @@ Pod::Spec.new do |s|
}
s.default_subspecs = 'Interface', 'Implementation'
- s.compiler_flags = '-DGRPC_ARES=0', '-DPB_FIELD_16BIT'
+ s.compiler_flags = '-DGRPC_ARES=0', '-DPB_FIELD_32BIT'
s.libraries = 'c++'
# Like many other C libraries, gRPC-Core has its public headers under `include/<libname>/` and its
diff --git a/setup.py b/setup.py
index 7bdfc99e24..7f58e7ca07 100644
--- a/setup.py
+++ b/setup.py
@@ -160,7 +160,7 @@ if EXTRA_ENV_COMPILE_ARGS is None:
EXTRA_ENV_COMPILE_ARGS += ' -std=gnu99 -fvisibility=hidden -fno-wrapv -fno-exceptions'
elif "darwin" in sys.platform:
EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv -fno-exceptions'
-EXTRA_ENV_COMPILE_ARGS += ' -DPB_FIELD_16BIT'
+EXTRA_ENV_COMPILE_ARGS += ' -DPB_FIELD_32BIT'
if EXTRA_ENV_LINK_ARGS is None:
EXTRA_ENV_LINK_ARGS = ''
diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template
index 1628493d00..f33d980cd0 100644
--- a/templates/CMakeLists.txt.template
+++ b/templates/CMakeLists.txt.template
@@ -143,7 +143,7 @@
## Some libraries are shared even with BUILD_SHARED_LIBRARIES=OFF
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
- add_definitions(-DPB_FIELD_16BIT)
+ add_definitions(-DPB_FIELD_32BIT)
if (MSVC)
include(cmake/msvc_static_runtime.cmake)
diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template
index 461e8b767f..5e6080448b 100644
--- a/templates/gRPC-Core.podspec.template
+++ b/templates/gRPC-Core.podspec.template
@@ -152,7 +152,7 @@
}
s.default_subspecs = 'Interface', 'Implementation'
- s.compiler_flags = '-DGRPC_ARES=0', '-DPB_FIELD_16BIT'
+ s.compiler_flags = '-DGRPC_ARES=0', '-DPB_FIELD_32BIT'
s.libraries = 'c++'
# Like many other C libraries, gRPC-Core has its public headers under `include/<libname>/` and its