diff options
| author | Tor Lillqvist <tml@src.gnome.org> | 1999-01-16 23:46:42 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 1999-01-16 23:46:42 +0000 |
| commit | f477518c3af60dccfdd172abee0c7368e8f44189 (patch) | |
| tree | a49e3518958eb7d6525068b2489b3e87f724d145 /giochannel.c | |
| parent | 883776f0353e0cf3bf60f854bb1795e921748dcd (diff) | |
| download | glib-f477518c3af60dccfdd172abee0c7368e8f44189.tar.gz | |
Merge in current Win32 version. Almost no Unix code touched.
* README.win32: More text.
* config.h.win32 glibconfig.h.win32: Update to match the
corresponding generated files on Unix.
* makefile.msc: Update with new source files, and gthread
library. Use the compiler flag -MD instead of using -D_DLL and
"/nodefaultlib:libc msvcrt.lib" in the link phase.
* glib.def: Include new functions, drop removed ones.
* glib.h: Add comments about main loop and polling on Win32. (In
general, it's only for the GIMP's use.) Add Win32 IO Channel
functions. Remove the obsoleted old IO Channel stuff (which was
in #if 0 already).
* giowin32.c: New file.
* gmain.c: Include config.h, conditionalize <sys/time.h>
inclusion. Add g_poll implementation for Win32 (only for the
GIMP's needs for now, it's hard or even impossible to be as clean
and generic as on Unix). Implement g_get_current_time on Win32. If
threads aren't supported, don't try to wake up main thread's
loop. On Win32, use a semaphore and not a pipe to wake up the main
loop.
* gmessages.c: On Win32, allocate a console window if the standard
output handle is invalid before writing to stdout, and reopen stdout
to that console window.
* giochannel.c: Conditionalize unistd.h inclusion. Some indentation
cleanup.
* gstrfuncs.c: Include <signal.h>.
* gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH
environment variables.
* gmodule-dl.c gmodule-dld.c: In
_g_module_build_path, don't add the "lib" prefix and
".so" or ".sl" suffix if already there.
* gmodule-win32.c: Likewise for the ".dll" suffix.
* gthread-posix.c: Conditionalize <sys/time.h> inclusion.
Diffstat (limited to 'giochannel.c')
| -rw-r--r-- | giochannel.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/giochannel.c b/giochannel.c index a9bf10a8a..7c05e3c81 100644 --- a/giochannel.c +++ b/giochannel.c @@ -24,8 +24,12 @@ * MT safe */ +#include "config.h" + #include "glib.h" +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif void g_io_channel_init (GIOChannel *channel) @@ -94,7 +98,7 @@ g_io_channel_close (GIOChannel *channel) } guint -g_io_add_watch_full (GIOChannel *channel, +g_io_add_watch_full (GIOChannel *channel, gint priority, GIOCondition condition, GIOFunc func, @@ -108,7 +112,7 @@ g_io_add_watch_full (GIOChannel *channel, } guint -g_io_add_watch (GIOChannel *channel, +g_io_add_watch (GIOChannel *channel, GIOCondition condition, GIOFunc func, gpointer user_data) |