diff options
| author |  Feng Xiao <xiaofeng@google.com> | 2016-01-20 16:57:01 -0800 |
|---|---|---|
| committer | Feng Xiao <xiaofeng@google.com> | 2016-01-20 16:57:01 -0800 |
| commit | fe066bd514fcd08f2c2bf94d3d0e89e3c4f10884 (patch) | |
| tree | d52806441cbeddd4bc62e62ea5583147143298f5 /src/google/protobuf/stubs/platform_macros.h | |
| parent | 8c5260b21bb0e217e91375893d507a0ef6578d67 (diff) | |
| parent | 97fa4ca1565d216d102af9510b17966c28c7a52a (diff) | |
Merge pull request #789 from motahan/solaris64_fix
Fixing compile errors on Solaris in 64-bit mode
Diffstat (limited to 'src/google/protobuf/stubs/platform_macros.h')
| -rw-r--r-- | src/google/protobuf/stubs/platform_macros.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/stubs/platform_macros.h b/src/google/protobuf/stubs/platform_macros.h index 5cde8f4e..22b35723 100644 --- a/src/google/protobuf/stubs/platform_macros.h +++ b/src/google/protobuf/stubs/platform_macros.h @@ -65,7 +65,7 @@ #define GOOGLE_PROTOBUF_ARCH_32_BIT 1 #elif defined(sparc) #define GOOGLE_PROTOBUF_ARCH_SPARC 1 -#ifdef SOLARIS_64BIT_ENABLED +#if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__) #define GOOGLE_PROTOBUF_ARCH_64_BIT 1 #else #define GOOGLE_PROTOBUF_ARCH_32_BIT 1 |