CVSROOT: /cvs/gnome Module name: ORBit2 Changes by: tml 05/01/27 07:02:30
Modified files: linc2 : ChangeLog linc2/src : linc-compat.c linc-compat.h linc-connection.c linc-debug.h linc-private.h linc-protocols.c linc-server.c linc-source.c linc.c linc2/test : test-linc.c Log message: 2005-01-27 Tor Lillqvist <[EMAIL PROTECTED]> * src/linc-compat.h: Include <sys/utime.h> if that's where utime.h is. * src/linc-private.h (LinxUnixWatch): On Win32, the GPollFD::fd is actually a HANDLE, so keep also the original SOCKET around, and the desired socket event mask. (LINK_TEMP_FAILURE_RETRY): Split into separate macros for retrying "normal" system call API and socket API. They're different on Win32. (LINK_CLOSE_SOCKET): New macro. On Win32 uses closesocket(). * src/*.c: Adapt to above changes. Include linc-compat.h. Add more d_printf() debugging output (which normally expands to nothing). Add WinSock code. Bypass Unix-only stuff on Win32. * src/linc-debug.h: Always define CONNECTION_DEBUG on Win32 (for now while working on Win32 port). * src/linc-protocols.c: Use LINK_PROTOCOL_NEEDS_BIND for IPv4 on Win32. * src/linc-source.c: The core machinery for interfacing to the GLib main loop on Win32 is here. (link_source_prepare): Call WSAEventSelect() if the event mask (i.e., condition) has changed. (link_source_dispatch): Call WSAEnumNetworkEvents() to find out what socket event actually fired. (link_source_create_watch): Create an event to poll on in the GLib main loop. Store that in the GPollFD::fd. (link_watch_unlisten): Close the events. * src/linc.c: On Win32, instead of a pipe, use a connected TCP socket pair as the wakeup pipe. (link_init): Start WinSock. * test/test-linc.c (init_tmp): Use g_build_filename(). (create_server, create_client): On Win32 use IPv4 not UNIX sockets. (test_broken): Only if HAVE_SYS_WAIT_H. (knobble_watch): Don't use a pointer before asserting it's non-NULL. Don't g_assert() an expression with side-effects, g_assert expands to empty when compiled with G_DISABLE_ASSERT. (test_local): Don't test UNIX sockets on Win32. (test_blocking, main): For some reason the "blocking" test doesn't work on Win32, bypass for now. URL : http://cvs.gnome.org/bonsai/cvsquery.cgi?branch=&dir=ORBit2&who=tml&date=explicit&mindate=2005-01-27%2007:01&maxdate=2005-01-27%2007:03 _______________________________________________ cvs-commits-list mailing list cvs-commits-list@gnome.org http://mail.gnome.org/mailman/listinfo/cvs-commits-list