diff options
| author | Jisi Liu <liujisi@google.com> | 2017-12-20 15:06:14 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-20 15:06:14 -0800 |
| commit | d69f33304f0ccac668135875a830460ca8221bca (patch) | |
| tree | aa038700d75dfddbe9761b7698fe097307e3d018 | |
| parent | d106399d39a3a5719f1e3d8b5997a4437eb83af3 (diff) | |
| parent | ad8a82ee7590fb4866d6fd5a410c393fca63e247 (diff) | |
| download | protobuf-d69f33304f0ccac668135875a830460ca8221bca.tar.gz protobuf-d69f33304f0ccac668135875a830460ca8221bca.tar.bz2 protobuf-d69f33304f0ccac668135875a830460ca8221bca.zip | |
Merge pull request #4080 from pherl/arm64
Add support for Windows ARM64 build
| -rw-r--r-- | src/google/protobuf/stubs/platform_macros.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/google/protobuf/stubs/platform_macros.h b/src/google/protobuf/stubs/platform_macros.h index 7a54060d..c3a64dd2 100644 --- a/src/google/protobuf/stubs/platform_macros.h +++ b/src/google/protobuf/stubs/platform_macros.h @@ -50,6 +50,9 @@ #elif defined(_M_ARM) || defined(__ARMEL__) #define GOOGLE_PROTOBUF_ARCH_ARM 1 #define GOOGLE_PROTOBUF_ARCH_32_BIT 1 +#elif defined(_M_ARM64) +#define GOOGLE_PROTOBUF_ARCH_ARM 1 +#define GOOGLE_PROTOBUF_ARCH_64_BIT 1 #elif defined(__aarch64__) #define GOOGLE_PROTOBUF_ARCH_AARCH64 1 #define GOOGLE_PROTOBUF_ARCH_64_BIT 1 |