From: <ni...@us...> - 2007-12-28 00:33:32
|
Revision: 618 http://levent.svn.sourceforge.net/levent/?rev=618&view=rev Author: nickm Date: 2007-12-27 16:32:45 -0800 (Thu, 27 Dec 2007) Log Message: ----------- More project file tweaks to build more of 1.3 under VC Modified Paths: -------------- branches/patches-1.3/libevent/WIN32-Prj/libevent.vcproj branches/patches-1.3/libevent/buffer.c branches/patches-1.3/libevent/compat/sys/_time.h branches/patches-1.3/libevent/event.c branches/patches-1.3/libevent/event.h Modified: branches/patches-1.3/libevent/WIN32-Prj/libevent.vcproj =================================================================== --- branches/patches-1.3/libevent/WIN32-Prj/libevent.vcproj 2007-12-27 23:17:24 UTC (rev 617) +++ branches/patches-1.3/libevent/WIN32-Prj/libevent.vcproj 2007-12-28 00:32:45 UTC (rev 618) @@ -172,6 +172,14 @@ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" > <File + RelativePath="..\buffer.c" + > + </File> + <File + RelativePath="..\evbuffer.c" + > + </File> + <File RelativePath="..\event.c" > <FileConfiguration @@ -238,6 +246,10 @@ </FileConfiguration> </File> <File + RelativePath="..\strlcpy.c" + > + </File> + <File RelativePath="..\WIN32-Code\win32.c" > <FileConfiguration @@ -273,13 +285,37 @@ > </File> <File + RelativePath="..\evdns.h" + > + </File> + <File + RelativePath="..\event-internal.h" + > + </File> + <File RelativePath="..\event.h" > </File> <File + RelativePath="..\evsignal.h" + > + </File> + <File + RelativePath="..\http-internal.h" + > + </File> + <File + RelativePath="..\log.h" + > + </File> + <File RelativePath="..\WIN32-Code\misc.h" > </File> + <File + RelativePath="..\strlcpy-internal.h" + > + </File> </Filter> </Files> <Globals> Modified: branches/patches-1.3/libevent/buffer.c =================================================================== --- branches/patches-1.3/libevent/buffer.c 2007-12-27 23:17:24 UTC (rev 617) +++ branches/patches-1.3/libevent/buffer.c 2007-12-28 00:32:45 UTC (rev 618) @@ -356,8 +356,13 @@ #endif #ifdef FIONREAD +#ifdef WIN32 + long lng = n; + if (ioctlsocket(fd, FIONREAD, &lng) == -1 || (n=lng) == 0) { +#else if (ioctl(fd, FIONREAD, &n) == -1 || n == 0) { n = EVBUFFER_MAX_READ; +#endif } else if (n > EVBUFFER_MAX_READ && n > howmuch) { /* * It's possible that a lot of data is available for Modified: branches/patches-1.3/libevent/compat/sys/_time.h =================================================================== --- branches/patches-1.3/libevent/compat/sys/_time.h 2007-12-27 23:17:24 UTC (rev 617) +++ branches/patches-1.3/libevent/compat/sys/_time.h 2007-12-28 00:32:45 UTC (rev 618) @@ -37,6 +37,9 @@ #include <sys/types.h> +#ifdef WIN32 +#include <winsock2.h> +#else /* * Structure returned by gettimeofday(2) system call, * and used in other calls. @@ -45,6 +48,7 @@ long tv_sec; /* seconds */ long tv_usec; /* and microseconds */ }; +#endif /* * Structure defined by POSIX.1b to be like a timeval. @@ -78,10 +82,12 @@ /* Operations on timevals. */ #define timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0 #define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec) +#ifndef WIN32 #define timercmp(tvp, uvp, cmp) \ (((tvp)->tv_sec == (uvp)->tv_sec) ? \ ((tvp)->tv_usec cmp (uvp)->tv_usec) : \ ((tvp)->tv_sec cmp (uvp)->tv_sec)) +#endif #define timeradd(tvp, uvp, vvp) \ do { \ (vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec; \ Modified: branches/patches-1.3/libevent/event.c =================================================================== --- branches/patches-1.3/libevent/event.c 2007-12-27 23:17:24 UTC (rev 617) +++ branches/patches-1.3/libevent/event.c 2007-12-28 00:32:45 UTC (rev 618) @@ -38,7 +38,7 @@ #include <sys/tree.h> #ifdef HAVE_SYS_TIME_H #include <sys/time.h> -#else +#else #include <sys/_time.h> #endif #include <sys/queue.h> Modified: branches/patches-1.3/libevent/event.h =================================================================== --- branches/patches-1.3/libevent/event.h 2007-12-27 23:17:24 UTC (rev 617) +++ branches/patches-1.3/libevent/event.h 2007-12-28 00:32:45 UTC (rev 618) @@ -43,6 +43,7 @@ #undef WIN32_LEAN_AND_MEAN typedef unsigned char u_char; typedef unsigned short u_short; +#include <winsock2.h> #endif #define EVLIST_TIMEOUT 0x01 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |