From: Tor Lillqvist <tml@novell.com>
Date: Mon, 15 Jan 2007 02:28:01 +0000 (+0000)
Subject: Prepare for potential Win64 build: Use gint64 for the fd field on Win64,
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=8d9150647ca5bde5138edf58282a2c9da8f622b1;p=dana%2Fcg-glib.git

Prepare for potential Win64 build: Use gint64 for the fd field on Win64,

2007-01-15  Tor Lillqvist  <tml@novell.com>

	* glib/gmain.h (struct _GPollFD): Prepare for potential Win64
	build: Use gint64 for the fd field on Win64, as we want to be able
	to store a HANDLE in it. (#395422) (Other changes will surely also
	be necessary when building on Win64, at least in gwin32.c.)


svn path=/trunk/; revision=5260
---

diff --git a/ChangeLog b/ChangeLog
index 85e0808b..4871859d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-15  Tor Lillqvist  <tml@novell.com>
+
+	* glib/gmain.h (struct _GPollFD): Prepare for potential Win64
+	build: Use gint64 for the fd field on Win64, as we want to be able
+	to store a HANDLE in it. (#395422) (Other changes will surely also
+	be necessary when building on Win64, at least in gwin32.c.)
+
 2007-01-15  Tor Lillqvist  <tml@novell.com>
 
 	* glib/gwin32.c (g_win32_getlocale): Simplify greatly. Instead of
diff --git a/glib/gmain.h b/glib/gmain.h
index 8e8dd3fe..39f95155 100644
--- a/glib/gmain.h
+++ b/glib/gmain.h
@@ -120,7 +120,11 @@ typedef gint	(*GPollFunc)	(GPollFD *ufds,
 
 struct _GPollFD
 {
+#ifdef G_OS_WIN32 && GLIB_SIZEOF_VOID_P == 8
+  gint64	fd;
+#else
   gint		fd;
+#endif
   gushort 	events;
   gushort 	revents;
 };