From ef1f1025bf2951d8bd429a5825174cc25da404c5 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Thu, 22 Mar 2018 20:49:58 +1300
Subject: [PATCH] Define __WIN32__ and __WIN64__ for 64-bit MSVC

This matches what mingw64 GCC does.
---
 xapian-core/configure.ac | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/xapian-core/configure.ac b/xapian-core/configure.ac
index bf820c712..e550e472c 100644
--- a/xapian-core/configure.ac
+++ b/xapian-core/configure.ac
@@ -1431,10 +1431,15 @@ typedef long long off_t_redefinition_typedef;
 #endif
 
 /* MSVC defines _WIN32 but not __WIN32__. */
-#if !defined __WIN32__ && defined _WIN32 && !defined _WIN64
+#if !defined __WIN32__ && defined _WIN32
 # define __WIN32__
 #endif
 
+/* MSVC defines _WIN64 but not __WIN64__. */
+#if !defined __WIN64__ && defined _WIN64
+# define __WIN64__
+#endif
+
 /* _FORTIFY_SOURCE is only supported by GCC >= 4.1 and glibc >= 2.3.4, but it
  * shouldn't cause a problem to define it where it's not supported and some
  * distros may have backported support, so hardcoding version checks is
-- 
2.11.4.GIT