Make the union _GSystemThread::data array 8 bytes on Win64. Not that it

2008-08-04  Tor Lillqvist  <tml@novell.com>

	* glibconfig.h.win32.in: Make the union _GSystemThread::data array
	8 bytes on Win64. Not that it matters as the union contains a
	pointer also anyway, but for equivalence with the configure-
	generated glibconfig.h

svn path=/trunk/; revision=7309

diff --git a/ChangeLog b/ChangeLog
index b422a45..302da93 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-08-04  Tor Lillqvist  <tml@novell.com>
 
+       * glibconfig.h.win32.in: Make the union _GSystemThread::data array
+       8 bytes on Win64. Not that it matters as the union contains a
+       pointer also anyway, but for equivalence with the configure-
+       generated glibconfig.h
+
+2008-08-04  Tor Lillqvist  <tml@novell.com>
+
        * glib/gmain.c (g_get_current_time): MSDN says: "Do not cast a
        pointer to a FILETIME structure to either a LARGE_INTEGER* or
        __int64* value because it can cause alignment faults on 64-bit

diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in
index 1a422c7..013a213 100644 (file)
--- a/glibconfig.h.win32.in
+++ b/glibconfig.h.win32.in
@@ -200,7 +200,11 @@ typedef struct _GMutex* GStaticMutex;
 typedef union _GSystemThread GSystemThread;
 union _GSystemThread
 {
+#ifndef _WIN64
   char   data[4];
+#else
+  char   data[8];
+#endif
   double dummy_double;
   void  *dummy_pointer;
   long   dummy_long;