commit acfec5f2c069aa314c932910bedaeb8dbf61e8df
author Loo Rong Jie <loorongjie@gmail.com> Wed Feb 14 01:10:25 2018 -0800
committer Copybara-Service <copybara-piper@google.com> Wed Feb 14 01:11:55 2018 -0800
tree da6c81e1cbbf3cbaee1a6b65251c3c606461099e
parent 34b445edcef814dc2fcdd64e5c82777ecc43e48e

[MSVC] Detect 64-bit with _WIN64

Fixes MSVC C4311 pointer truncation warning.

Change-Id: Ic64168d620db010717189200c37c419cccac0653
PiperOrigin-RevId: 185653953

src/main/cpp/util/md5.cc

diff --git a/src/main/cpp/util/md5.cc b/src/main/cpp/util/md5.cc
index 0cb5a86..1c91bab 100644
--- a/src/main/cpp/util/md5.cc
+++ b/src/main/cpp/util/md5.cc
@@ -39,13 +39,13 @@
 
 #include "src/main/cpp/util/md5.h"
 
+#include <stddef.h>  // for offsetof
 #include <string.h>  // for memcpy
-#include <stddef.h>  // for ofsetof
 
 #include <cinttypes>
 
 #if !_STRING_ARCH_unaligned
-# ifdef _LP64
+#if defined(_LP64) || defined(_WIN64)
 #  define UNALIGNED_P(p) (reinterpret_cast<uint64_t>(p) % \
                           __alignof__(uint32_t) != 0)  // NOLINT
 # else