aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxfxyjwf <xfxyjwf@gmail.com>2014-09-18 13:51:56 -0700
committerxfxyjwf <xfxyjwf@gmail.com>2014-09-18 13:51:56 -0700
commit7b6c5d58a86cdfccf6ad6d3239407cba0557cf2c (patch)
tree0eb5a6e0d82551d5e4a387ea49125c89a15ae07c
parentedc5994525c79cd1919859a370837a6ff7c8e308 (diff)
parentd24b987c1485fedc4b8e57cb7ec7760ce598501b (diff)
downloadprotobuf-7b6c5d58a86cdfccf6ad6d3239407cba0557cf2c.tar.gz
protobuf-7b6c5d58a86cdfccf6ad6d3239407cba0557cf2c.tar.bz2
protobuf-7b6c5d58a86cdfccf6ad6d3239407cba0557cf2c.zip
Merge pull request #20 from edmonds/branches/no_ppc
Remove GOOGLE_PROTOBUF_ARCH_PPC
-rw-r--r--src/google/protobuf/stubs/platform_macros.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/google/protobuf/stubs/platform_macros.h b/src/google/protobuf/stubs/platform_macros.h
index 1705b416..4cc46df4 100644
--- a/src/google/protobuf/stubs/platform_macros.h
+++ b/src/google/protobuf/stubs/platform_macros.h
@@ -62,9 +62,6 @@
#endif
#elif defined(__pnacl__)
#define GOOGLE_PROTOBUF_ARCH_32_BIT 1
-#elif defined(__ppc__)
-#define GOOGLE_PROTOBUF_ARCH_PPC 1
-#define GOOGLE_PROTOBUF_ARCH_32_BIT 1
#elif defined(__GNUC__) && \
(((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4))
// We fallback to the generic GCC >= 4.7 implementation in atomicops.h