From: Tor Lillqvist <tml@novell.com>
Date: Wed, 23 Jul 2008 23:53:15 +0000 (+0000)
Subject: Check also _WIN64.
X-Git-Tag: GLIB_2_17_5~50
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d395b1dcda2e569b5721520dab67a794023ea646;p=platform%2Fupstream%2Fglib.git

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 d067796..b0da624 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 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
 	Hult.
 
diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in
index 6bb0db6..426c582 100644
--- 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