Merge pull request #4080 from pherl/arm64

Add support for Windows ARM64 build
pull/4089/head
Jisi Liu 7 years ago committed by GitHub
commit d69f33304f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      src/google/protobuf/stubs/platform_macros.h

@ -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

Loading…
Cancel
Save