aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiradham Kamilov <mkamilov@gmail.com>2017-12-19 14:01:58 +0900
committerJisi Liu <jisi.liu@gmail.com>2017-12-20 14:52:14 -0800
commitad8a82ee7590fb4866d6fd5a410c393fca63e247 (patch)
tree8751f55215e3608f264c937a8893ddd69fe65d71
parenteff55ece0813c16d318a80ec20c89d81bac34efc (diff)
downloadprotobuf-ad8a82ee7590fb4866d6fd5a410c393fca63e247.tar.gz
protobuf-ad8a82ee7590fb4866d6fd5a410c393fca63e247.tar.bz2
protobuf-ad8a82ee7590fb4866d6fd5a410c393fca63e247.zip
Add support for Windows ARM64 build
-rw-r--r--src/google/protobuf/stubs/platform_macros.h3
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