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 85e0808..4871859 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 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
        hardcoding a large switch statement, just ask Windows for the
        ISO639 and ISO3166 codes. Tack on @Latn or @Cyrl for those

diff --git a/glib/gmain.h b/glib/gmain.h
index 8e8dd3f..39f9515 100644 (file)
--- 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;
 };