Mercurial > pidgin
changeset 29486:3015b7c2bec3
incomplete win32 fixes
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Thu, 25 Feb 2010 05:09:02 +0000 |
| parents | 2071b92780e5 |
| children | c08740a93dd1 |
| files | libpurple/example/nullclient.c |
| diffstat | 1 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/example/nullclient.c Thu Feb 25 04:45:28 2010 +0000 +++ b/libpurple/example/nullclient.c Thu Feb 25 05:09:02 2010 +0000 @@ -27,7 +27,11 @@ #include <signal.h> #include <string.h> +#ifndef _WIN32 #include <unistd.h> +#else +#include "win32/win32dep.h" +#endif #include "defines.h" @@ -80,7 +84,11 @@ if (condition & PURPLE_INPUT_WRITE) cond |= PURPLE_GLIB_WRITE_COND; +#if defined _WIN32 && !defined WINPIDGIN_USE_GLIB_IO_CHANNEL + channel = wpurple_g_io_channel_win32_new_socket(fd); +#else channel = g_io_channel_unix_new(fd); +#endif closure->result = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, cond, purple_glib_io_invoke, closure, purple_glib_io_destroy); @@ -253,12 +261,14 @@ PurpleSavedStatus *status; char *res; +#ifndef _WIN32 /* libpurple's built-in DNS resolution forks processes to perform * blocking lookups without blocking the main process. It does not * handle SIGCHLD itself, so if the UI does not you quickly get an army * of zombie subprocesses marching around. */ signal(SIGCHLD, SIG_IGN); +#endif init_libpurple();