diff options
| author | Tor Lillqvist <tml@iki.fi> | 2000-10-06 21:32:59 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2000-10-06 21:32:59 +0000 |
| commit | 8e847255e8c396a5bacbbf2897ad78e36ee47900 (patch) | |
| tree | 3d6227b8a25700022f9fe6b59531a3b349be17d5 /giowin32.c | |
| parent | 0c6a1ee5310d872ad1f2bfdbc54df721a239c05f (diff) | |
| download | glib-8e847255e8c396a5bacbbf2897ad78e36ee47900.tar.gz | |
Revamp to be like makefile.mingw.in, make the MSVC build actually work
2000-10-06 Tor Lillqvist <tml@iki.fi>
* makefile.msc.in: Revamp to be like makefile.mingw.in, make
the MSVC build actually work again.
* gmodule/makefile.msc.in
* gobject/makefile.msc.in
* gthread/makefile.msc.in: New files, like their mingw counterparts.
* gmodule/Makefile.am
* gobject/Makefile.am
* gthread/Makefile.am: Make and distribute them.
* */makefile.mingw.in: Allow override of GLib version number from
the build/win32/module.defs file.
* glib.def: Add new entry point.
Fixes from Hans Breuer:
* glib.h (struct DIR): Keep the last readdir result cached inside
the DIR struct, to enable several DIRs being open simultaneously.
* gwin32.c (g_win32_readdir): Use the above instead of static.
* giowin32.c (g_io_channel_win32_make_pollfd): Insert cast to keep
MSVC happy.
Diffstat (limited to 'giowin32.c')
| -rw-r--r-- | giowin32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/giowin32.c b/giowin32.c index 4acdb160a..89cdb0e2b 100644 --- a/giowin32.c +++ b/giowin32.c @@ -897,7 +897,7 @@ g_io_channel_win32_make_pollfd (GIOChannel *channel, if (win32_channel->data_avail_event == NULL) create_events (win32_channel); - fd->fd = win32_channel->data_avail_event; + fd->fd = (gint) win32_channel->data_avail_event; fd->events = condition; if (win32_channel->thread_id == 0) |