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
This commit is contained in:
Tor Lillqvist 2007-01-15 02:28:01 +00:00 committed by Tor Lillqvist
parent 12706811c2
commit 8d9150647c
2 changed files with 11 additions and 0 deletions

View File

@ -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

View File

@ -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;
};