commit d69f33304f0ccac668135875a830460ca8221bca
author Jisi Liu <liujisi@google.com> Wed Dec 20 15:06:14 2017 -0800
committer GitHub <noreply@github.com> Wed Dec 20 15:06:14 2017 -0800
tree aa038700d75dfddbe9761b7698fe097307e3d018
parent d106399d39a3a5719f1e3d8b5997a4437eb83af3
parent ad8a82ee7590fb4866d6fd5a410c393fca63e247

Merge pull request #4080 from pherl/arm64

Add support for Windows ARM64 build

src/google/protobuf/stubs/platform_macros.h

diff --git a/src/google/protobuf/stubs/platform_macros.h b/src/google/protobuf/stubs/platform_macros.h
index 7a54060..c3a64dd 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