diff options
| author | Jisi Liu <liujisi@google.com> | 2017-12-20 14:48:30 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-20 14:48:30 -0800 |
| commit | b5f09c1ee0171f26aa050386a98a87a2721d1156 (patch) | |
| tree | ff41fb50b995b54fb2460e6985531ca1a2ab1578 | |
| parent | a5b743f8ae55f17cc06b8d67b822c697a792a814 (diff) | |
| parent | 03fb09932b9882f896a5f20ecda71d194fa40504 (diff) | |
| download | protobuf-b5f09c1ee0171f26aa050386a98a87a2721d1156.tar.gz protobuf-b5f09c1ee0171f26aa050386a98a87a2721d1156.tar.bz2 protobuf-b5f09c1ee0171f26aa050386a98a87a2721d1156.zip | |
Merge pull request #4077 from mkamilov/master
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 |