Check also _WIN64.

2008-07-24  Tor Lillqvist  <tml@novell.com>

	* glibconfig.h.win32.in: Check also _WIN64.

svn path=/trunk/; revision=7247

diff --git a/ChangeLog b/ChangeLog
index d0677969bedf19a45a804071b3b02790a07fd2a2..b0da624bd18587d8ede7829e96c7da85a2f006ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-24  Tor Lillqvist  <tml@novell.com>
+
+       * glibconfig.h.win32.in: Check also _WIN64.
+
 2008-07-24  Tor Lillqvist  <tml@novell.com>
 
        * glibconfig.h.win32.in: Patch for 64-bit Windows from Richard

diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in
index 6bb0db6d0e4aab8a0d48a29d9a7ed4ecdb4bb1f0..426c582e6d517e6ba93e1d1d365ca755a6096774 100644 (file)
--- a/glibconfig.h.win32.in
+++ b/glibconfig.h.win32.in
@@ -64,7 +64,7 @@ typedef unsigned __int64 guint64;
 #define G_GINT64_FORMAT "I64i"
 #define G_GUINT64_FORMAT "I64u"
 
-#if defined(_M_X64) || defined(_M_AMD64)
+#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64)
 
 #define GLIB_SIZEOF_VOID_P 8
 #define GLIB_SIZEOF_LONG   4