Home Explore Help
Sign In
carto
/
protobuf
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge pull request #4080 from pherl/arm64

Add support for Windows ARM64 build
Jisi Liu 7 years ago
parent
d106399d39 ad8a82ee75
commit
d69f33304f
1 changed files with 3 additions and 0 deletions
Unified View Show Diff Stats
  1. 3 0
      src/google/protobuf/stubs/platform_macros.h

+ 3 - 0
src/google/protobuf/stubs/platform_macros.h
View File 

@@ -50,6 +50,9 @@
 
 #elif defined(_M_ARM) || defined(__ARMEL__)
 
 #elif defined(_M_ARM) || defined(__ARMEL__)
 
 #define GOOGLE_PROTOBUF_ARCH_ARM 1
 
 #define GOOGLE_PROTOBUF_ARCH_ARM 1
 
 #define GOOGLE_PROTOBUF_ARCH_32_BIT 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__)
 
 #elif defined(__aarch64__)
 
 #define GOOGLE_PROTOBUF_ARCH_AARCH64 1
 
 #define GOOGLE_PROTOBUF_ARCH_AARCH64 1
 
 #define GOOGLE_PROTOBUF_ARCH_64_BIT 1
 
 #define GOOGLE_PROTOBUF_ARCH_64_BIT 1