diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2017-11-08 15:27:48 -0800 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-11-08 15:27:48 -0800 |
| commit | 181e284b55dd234320b0e4fd5fbc81a5dfa6b580 (patch) | |
| tree | 9a0bcb181af9ff91eea5be98abd13dd42a5c9e37 /cmake | |
| parent | 1144768dd63effc560a3d64996398d149620b575 (diff) | |
| download | protobuf-181e284b55dd234320b0e4fd5fbc81a5dfa6b580.tar.gz protobuf-181e284b55dd234320b0e4fd5fbc81a5dfa6b580.tar.bz2 protobuf-181e284b55dd234320b0e4fd5fbc81a5dfa6b580.zip | |
Fix Atomic32/AtomicWord on some platforms.
- Removed the redefination in the atomicword_compat.h. Now Atomic32 will
alwyas be intptr_t in 32bit platforms, the bridge is no longer needed.
- Change NaCl 64bit to use intptr_t instead of int32 for Atomic32,
otherwise AtmoicWord APIs will miss the definations.
After this change, the AtmoicWord will always be either Atomic32 or
Atmoic64 depending on the platforms.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/extract_includes.bat.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cmake/extract_includes.bat.in b/cmake/extract_includes.bat.in index deb6de3b..5212d00a 100644 --- a/cmake/extract_includes.bat.in +++ b/cmake/extract_includes.bat.in @@ -83,7 +83,6 @@ copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops.h" in copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_arm64_gcc.h" include\google\protobuf\stubs\atomicops_internals_arm64_gcc.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_arm_gcc.h" include\google\protobuf\stubs\atomicops_internals_arm_gcc.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_arm_qnx.h" include\google\protobuf\stubs\atomicops_internals_arm_qnx.h -copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_atomicword_compat.h" include\google\protobuf\stubs\atomicops_internals_atomicword_compat.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_generic_c11_atomic.h" include\google\protobuf\stubs\atomicops_internals_generic_c11_atomic.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_generic_gcc.h" include\google\protobuf\stubs\atomicops_internals_generic_gcc.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_mips_gcc.h" include\google\protobuf\stubs\atomicops_internals_mips_gcc.h |