diff options
| author | xfxyjwf <xfxyjwf@gmail.com> | 2014-09-18 17:19:19 -0700 |
|---|---|---|
| committer | xfxyjwf <xfxyjwf@gmail.com> | 2014-09-18 17:19:19 -0700 |
| commit | 8d5f1e1efb6c1a99aa4997d519767d5865e06e03 (patch) | |
| tree | e20e6ae0ecc3068711f933132ecb1d901f7f6691 | |
| parent | 5c8ab2cbb3b88c67623ce1ca1c9d45eb0b47e7ab (diff) | |
| parent | 7432af823a45b954a8bc6018cdc7fa4c1f8fd16f (diff) | |
| download | protobuf-8d5f1e1efb6c1a99aa4997d519767d5865e06e03.tar.gz protobuf-8d5f1e1efb6c1a99aa4997d519767d5865e06e03.tar.bz2 protobuf-8d5f1e1efb6c1a99aa4997d519767d5865e06e03.zip | |
Merge pull request #27 from edmonds/branches/fix_generic_atomicops_non_clang
Fix atomicops build failure on non-Clang
| -rw-r--r-- | src/google/protobuf/stubs/atomicops.h | 9 | ||||
| -rw-r--r-- | src/google/protobuf/stubs/platform_macros.h | 18 |
2 files changed, 20 insertions, 7 deletions
diff --git a/src/google/protobuf/stubs/atomicops.h b/src/google/protobuf/stubs/atomicops.h index 8ddd2508..17b7be7f 100644 --- a/src/google/protobuf/stubs/atomicops.h +++ b/src/google/protobuf/stubs/atomicops.h @@ -192,9 +192,14 @@ GOOGLE_PROTOBUF_ATOMICOPS_ERROR #include <google/protobuf/stubs/atomicops_internals_mips_gcc.h> #elif defined(__native_client__) #include <google/protobuf/stubs/atomicops_internals_pnacl.h> -#elif (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4)) || \ - (defined(__clang__) && __has_extension(c_atomic)) +#elif (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4)) #include <google/protobuf/stubs/atomicops_internals_generic_gcc.h> +#elif defined(__clang__) +#if __has_extension(c_atomic) +#include <google/protobuf/stubs/atomicops_internals_generic_gcc.h> +#else +GOOGLE_PROTOBUF_ATOMICOPS_ERROR +#endif #else GOOGLE_PROTOBUF_ATOMICOPS_ERROR #endif diff --git a/src/google/protobuf/stubs/platform_macros.h b/src/google/protobuf/stubs/platform_macros.h index 02c79a61..1d1d59a7 100644 --- a/src/google/protobuf/stubs/platform_macros.h +++ b/src/google/protobuf/stubs/platform_macros.h @@ -33,6 +33,9 @@ #include <google/protobuf/stubs/common.h> +#define GOOGLE_PROTOBUF_PLATFORM_ERROR \ +#error "Host platform was not detected as supported by protobuf" + // Processor architecture detection. For more info on what's defined, see: // http://msdn.microsoft.com/en-us/library/b0084kay.aspx // http://www.agner.org/optimize/calling_conventions.pdf @@ -62,17 +65,22 @@ #endif #elif defined(__pnacl__) #define GOOGLE_PROTOBUF_ARCH_32_BIT 1 -#elif defined(__GNUC__) && \ - ((((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4)) || \ - (defined(__clang__) && __has_extension(c_atomic))) -// We fallback to the generic GCC >= 4.7 implementation in atomicops.h +#elif defined(__GNUC__) +# if (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4)) +// We fallback to the generic Clang/GCC >= 4.7 implementation in atomicops.h +# elif defined(__clang__) +# if !__has_extension(c_atomic) +GOOGLE_PROTOBUF_PLATFORM_ERROR +# endif +// We fallback to the generic Clang/GCC >= 4.7 implementation in atomicops.h +# endif # if __LP64__ # define GOOGLE_PROTOBUF_ARCH_64_BIT 1 # else # define GOOGLE_PROTOBUF_ARCH_32_BIT 1 # endif #else -#error Host architecture was not detected as supported by protobuf +GOOGLE_PROTOBUF_PLATFORM_ERROR #endif #if defined(__APPLE__) |