Hi.
I'm interested in trying the libevent library for cross-platform
capability, but unfortunately have to use msvc under windows. The
library required some patching to make it work under msvc, though.
The patch isn't final, I had to comment out some things. If you're
interested in this patch and want better polished patch, I'll do it.
Unfortunately, event-test.c still doesn't work, but another two examples
do work as expected.
--
- Eugene 'HMage' Bujak.
diff -uNr libevent-1.4.1-beta/WIN32-Code/config.h
libevent-1.4.1-beta-win32/WIN32-Code/config.h
--- libevent-1.4.1-beta/WIN32-Code/config.h Mon Nov 12 05:37:32 2007
+++ libevent-1.4.1-beta-win32/WIN32-Code/config.h Fri Jan 11 16:28:45 2008
@@ -207,7 +207,7 @@
/* Define to appropriate substitue if compiler doesnt have __func__ */
#if defined(_MSC_VER) && _MSC_VER < 1300
-#define __func__ "??"
+#define __func__ __FILE__
#else
#define __func__ __FUNCTION__
#endif
diff -uNr libevent-1.4.1-beta/WIN32-Code/win32.c
libevent-1.4.1-beta-win32/WIN32-Code/win32.c
--- libevent-1.4.1-beta/WIN32-Code/win32.c Sat Dec 22 06:03:54 2007
+++ libevent-1.4.1-beta-win32/WIN32-Code/win32.c Fri Jan 11 16:30:00 2008
@@ -48,6 +48,10 @@
#include "log.h"
#include "event.h"
#include "event-internal.h"
+
+//#ifndef USE_DEBUG
+//#error USE_DEBUG is not defined
+//#endif
#define XFREE(ptr) do { if (ptr) free(ptr); } while(0)
@@ -231,9 +235,30 @@
#define NEVENT 64
void *
win32_init(struct event_base *_base)
-{
+{
struct win32op *winop;
- size_t size;
+ size_t size;
+
+#ifdef WIN32
+ WORD wVersionRequested;
+ WSADATA wsaData;
+ int retval;
+
+ wVersionRequested = MAKEWORD( 2, 2 );
+
+ retval = WSAStartup( wVersionRequested, &wsaData );
+ if (retval != 0) {
+ event_err(1, "Couldn't initialize WinSock library.\n");
+ return NULL;
+ }
+
+ if (LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 2) {
+ event_err(1, "WinSock library is not acceptable version.\n");
+ return NULL;
+ }
+
+#endif
+
if (!(winop = calloc(1, sizeof(struct win32op))))
return NULL;
winop->fd_setsz = NEVENT;
@@ -422,7 +447,9 @@
free(win32op->writeset_out);
if (win32op->exset_out)
free(win32op->exset_out);
- /* XXXXX free the tree. */
+ /* XXXXX free the tree. */
+
+ WSACleanup();
memset(win32op, 0, sizeof(win32op));
free(win32op);
Binary files libevent-1.4.1-beta/WIN32-Prj/Debug/buffer.obj and
libevent-1.4.1-beta-win32/WIN32-Prj/Debug/buffer.obj differ
Binary files libevent-1.4.1-beta/WIN32-Prj/Debug/evbuffer.obj and
libevent-1.4.1-beta-win32/WIN32-Prj/Debug/evbuffer.obj differ
Binary files libevent-1.4.1-beta/WIN32-Prj/Debug/evdns.sbr and
libevent-1.4.1-beta-win32/WIN32-Prj/Debug/evdns.sbr differ
Binary files libevent-1.4.1-beta/WIN32-Prj/Debug/event.obj and
libevent-1.4.1-beta-win32/WIN32-Prj/Debug/event.obj differ
Binary files libevent-1.4.1-beta/WIN32-Prj/Debug/event_tagging.obj and
libevent-1.4.1-beta-win32/WIN32-Prj/Debug/event_tagging.obj differ
Binary files libevent-1.4.1-beta/WIN32-Prj/Debug/evrpc.obj and
libevent-1.4.1-beta-win32/WIN32-Prj/Debug/evrpc.obj differ
Binary files libevent-1.4.1-beta/WIN32-Prj/Debug/evutil.obj and
libevent-1.4.1-beta-win32/WIN32-Prj/Debug/evutil.obj differ
Binary files libevent-1.4.1-beta/WIN32-Prj/Debug/http.sbr and
libevent-1.4.1-beta-win32/WIN32-Prj/Debug/http.sbr differ
Binary files libevent-1.4.1-beta/WIN32-Prj/Debug/libevent.bsc and
libevent-1.4.1-beta-win32/WIN32-Prj/Debug/libevent.bsc differ
Binary files libevent-1.4.1-beta/WIN32-Prj/Debug/libevent.lib and
libevent-1.4.1-beta-win32/WIN32-Prj/Debug/libevent.lib differ
Binary files libevent-1.4.1-beta/WIN32-Prj/Debug/libevent.pch and
libevent-1.4.1-beta-win32/WIN32-Prj/Debug/libevent.pch differ
Binary files libevent-1.4.1-beta/WIN32-Prj/Debug/log.obj and
libevent-1.4.1-beta-win32/WIN32-Prj/Debug/log.obj differ
Binary files libevent-1.4.1-beta/WIN32-Prj/Debug/misc.obj and
libevent-1.4.1-beta-win32/WIN32-Prj/Debug/misc.obj differ
Binary files libevent-1.4.1-beta/WIN32-Prj/Debug/select.obj and
libevent-1.4.1-beta-win32/WIN32-Prj/Debug/select.obj differ
Binary files libevent-1.4.1-beta/WIN32-Prj/Debug/signal.obj and
libevent-1.4.1-beta-win32/WIN32-Prj/Debug/signal.obj differ
Binary files libevent-1.4.1-beta/WIN32-Prj/Debug/strlcpy.obj and
libevent-1.4.1-beta-win32/WIN32-Prj/Debug/strlcpy.obj differ
Binary files libevent-1.4.1-beta/WIN32-Prj/Debug/vc60.idb and
libevent-1.4.1-beta-win32/WIN32-Prj/Debug/vc60.idb differ
Binary files libevent-1.4.1-beta/WIN32-Prj/Debug/vc60.pdb and
libevent-1.4.1-beta-win32/WIN32-Prj/Debug/vc60.pdb differ
Binary files libevent-1.4.1-beta/WIN32-Prj/Debug/win32.obj and
libevent-1.4.1-beta-win32/WIN32-Prj/Debug/win32.obj differ
Binary files libevent-1.4.1-beta/WIN32-Prj/event_test/Debug/event-test.obj and
libevent-1.4.1-beta-win32/WIN32-Prj/event_test/Debug/event-test.obj differ
Binary files libevent-1.4.1-beta/WIN32-Prj/event_test/Debug/event_test.exe and
libevent-1.4.1-beta-win32/WIN32-Prj/event_test/Debug/event_test.exe differ
Binary files libevent-1.4.1-beta/WIN32-Prj/event_test/Debug/event_test.ilk and
libevent-1.4.1-beta-win32/WIN32-Prj/event_test/Debug/event_test.ilk differ
Binary files libevent-1.4.1-beta/WIN32-Prj/event_test/Debug/event_test.pch and
libevent-1.4.1-beta-win32/WIN32-Prj/event_test/Debug/event_test.pch differ
Binary files libevent-1.4.1-beta/WIN32-Prj/event_test/Debug/event_test.pdb and
libevent-1.4.1-beta-win32/WIN32-Prj/event_test/Debug/event_test.pdb differ
Binary files libevent-1.4.1-beta/WIN32-Prj/event_test/Debug/vc60.idb and
libevent-1.4.1-beta-win32/WIN32-Prj/event_test/Debug/vc60.idb differ
Binary files libevent-1.4.1-beta/WIN32-Prj/event_test/Debug/vc60.pdb and
libevent-1.4.1-beta-win32/WIN32-Prj/event_test/Debug/vc60.pdb differ
diff -uNr libevent-1.4.1-beta/WIN32-Prj/event_test/event_test.dsp
libevent-1.4.1-beta-win32/WIN32-Prj/event_test/event_test.dsp
--- libevent-1.4.1-beta/WIN32-Prj/event_test/event_test.dsp Fri Jan 11
16:38:37 2008
+++ libevent-1.4.1-beta-win32/WIN32-Prj/event_test/event_test.dsp Fri Jan
11 08:35:20 2008
@@ -39,6 +39,7 @@
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D
"_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "..\..\\" /I "..\..\WIN32-Code" /I
"..\..\compat" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
@@ -49,7 +50,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ws2_32.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "event_test - Win32 Debug"
@@ -62,6 +63,7 @@
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\\" /I "..\..\WIN32-Code" /I
"..\..\compat" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
@@ -72,7 +74,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ws2_32.lib /nologo /subsystem:console /debug /machine:I386
/pdbtype:sept
!ENDIF
diff -uNr libevent-1.4.1-beta/WIN32-Prj/libevent.dsp
libevent-1.4.1-beta-win32/WIN32-Prj/libevent.dsp
--- libevent-1.4.1-beta/WIN32-Prj/libevent.dsp Fri Jan 11 16:38:31 2008
+++ libevent-1.4.1-beta-win32/WIN32-Prj/libevent.dsp Fri Jan 11 08:43:39 2008
@@ -41,7 +41,7 @@
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB"
/YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\\" /I "..\WIN32-Code" /I "..\compat" /D
"WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\WIN32-Code" /I "..\\" /I "..\compat" /D
"NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -64,7 +64,7 @@
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS"
/D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\\" /I "..\WIN32-Code" /I
"..\compat" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\WIN32-Code" /I "..\\" /I
"..\compat" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /FR
/YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -85,7 +85,11 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=..\log.c
+SOURCE=..\buffer.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\evbuffer.c
# End Source File
# Begin Source File
@@ -93,10 +97,38 @@
# End Source File
# Begin Source File
+SOURCE=..\event_tagging.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\evrpc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\evutil.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\log.c
+# End Source File
+# Begin Source File
+
SOURCE="..\WIN32-Code\misc.c"
# End Source File
# Begin Source File
+SOURCE=..\select.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\signal.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strlcpy.c
+# End Source File
+# Begin Source File
+
SOURCE="..\WIN32-Code\win32.c"
# End Source File
# End Group
@@ -117,11 +149,59 @@
# End Source File
# Begin Source File
+SOURCE=..\evdns.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\event-config.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\event-internal.h"
+# End Source File
+# Begin Source File
+
SOURCE=..\event.h
# End Source File
# Begin Source File
+SOURCE=..\evhttp.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\evrpc-internal.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\evrpc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\evsignal.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\evutil.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\http-internal.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\log.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\min_heap.h
+# End Source File
+# Begin Source File
+
SOURCE="..\WIN32-Code\misc.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strlcpy-internal.h"
# End Source File
# End Group
# End Target
Binary files libevent-1.4.1-beta/WIN32-Prj/libevent.ncb and
libevent-1.4.1-beta-win32/WIN32-Prj/libevent.ncb differ
Binary files libevent-1.4.1-beta/WIN32-Prj/libevent.opt and
libevent-1.4.1-beta-win32/WIN32-Prj/libevent.opt differ
Binary files libevent-1.4.1-beta/WIN32-Prj/signal_test/Debug/signal-test.obj
and libevent-1.4.1-beta-win32/WIN32-Prj/signal_test/Debug/signal-test.obj differ
Binary files libevent-1.4.1-beta/WIN32-Prj/signal_test/Debug/signal_test.exe
and libevent-1.4.1-beta-win32/WIN32-Prj/signal_test/Debug/signal_test.exe differ
Binary files libevent-1.4.1-beta/WIN32-Prj/signal_test/Debug/signal_test.ilk
and libevent-1.4.1-beta-win32/WIN32-Prj/signal_test/Debug/signal_test.ilk differ
Binary files libevent-1.4.1-beta/WIN32-Prj/signal_test/Debug/signal_test.pch
and libevent-1.4.1-beta-win32/WIN32-Prj/signal_test/Debug/signal_test.pch differ
Binary files libevent-1.4.1-beta/WIN32-Prj/signal_test/Debug/signal_test.pdb
and libevent-1.4.1-beta-win32/WIN32-Prj/signal_test/Debug/signal_test.pdb differ
Binary files libevent-1.4.1-beta/WIN32-Prj/signal_test/Debug/vc60.idb and
libevent-1.4.1-beta-win32/WIN32-Prj/signal_test/Debug/vc60.idb differ
Binary files libevent-1.4.1-beta/WIN32-Prj/signal_test/Debug/vc60.pdb and
libevent-1.4.1-beta-win32/WIN32-Prj/signal_test/Debug/vc60.pdb differ
diff -uNr libevent-1.4.1-beta/WIN32-Prj/signal_test/signal_test.dsp
libevent-1.4.1-beta-win32/WIN32-Prj/signal_test/signal_test.dsp
--- libevent-1.4.1-beta/WIN32-Prj/signal_test/signal_test.dsp Fri Jan 11
16:38:36 2008
+++ libevent-1.4.1-beta-win32/WIN32-Prj/signal_test/signal_test.dsp Fri Jan
11 08:35:19 2008
@@ -39,17 +39,18 @@
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D
"_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"
/YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\WIN32-Code" /I "..\..\\" /I
"..\..\compat" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D
"HAVE_CONFIG_H" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ws2_32.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "signal_test - Win32 Debug"
@@ -62,17 +63,18 @@
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\\" /I "..\..\WIN32-Code" /I
"..\..\compat" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\WIN32-Code" /I "..\..\\" /I
"..\..\compat" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D
"HAVE_CONFIG_H" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ws2_32.lib /nologo /subsystem:console /debug /machine:I386
/pdbtype:sept
!ENDIF
Binary files libevent-1.4.1-beta/WIN32-Prj/time_test/Debug/time-test.obj and
libevent-1.4.1-beta-win32/WIN32-Prj/time_test/Debug/time-test.obj differ
Binary files libevent-1.4.1-beta/WIN32-Prj/time_test/Debug/time_test.exe and
libevent-1.4.1-beta-win32/WIN32-Prj/time_test/Debug/time_test.exe differ
Binary files libevent-1.4.1-beta/WIN32-Prj/time_test/Debug/time_test.ilk and
libevent-1.4.1-beta-win32/WIN32-Prj/time_test/Debug/time_test.ilk differ
Binary files libevent-1.4.1-beta/WIN32-Prj/time_test/Debug/time_test.pch and
libevent-1.4.1-beta-win32/WIN32-Prj/time_test/Debug/time_test.pch differ
Binary files libevent-1.4.1-beta/WIN32-Prj/time_test/Debug/time_test.pdb and
libevent-1.4.1-beta-win32/WIN32-Prj/time_test/Debug/time_test.pdb differ
Binary files libevent-1.4.1-beta/WIN32-Prj/time_test/Debug/vc60.idb and
libevent-1.4.1-beta-win32/WIN32-Prj/time_test/Debug/vc60.idb differ
Binary files libevent-1.4.1-beta/WIN32-Prj/time_test/Debug/vc60.pdb and
libevent-1.4.1-beta-win32/WIN32-Prj/time_test/Debug/vc60.pdb differ
diff -uNr libevent-1.4.1-beta/WIN32-Prj/time_test/time_test.dsp
libevent-1.4.1-beta-win32/WIN32-Prj/time_test/time_test.dsp
--- libevent-1.4.1-beta/WIN32-Prj/time_test/time_test.dsp Fri Jan 11
16:38:34 2008
+++ libevent-1.4.1-beta-win32/WIN32-Prj/time_test/time_test.dsp Fri Jan 11
16:37:12 2008
@@ -39,17 +39,18 @@
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D
"_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"
/YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\WIN32-Code" /I "..\..\\" /I
"..\..\compat" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D
"HAVE_CONFIG_H" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ws2_32.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "time_test - Win32 Debug"
@@ -62,17 +63,18 @@
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\\" /I "..\..\WIN32-Code" /I
"..\..\compat" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\\" /I "..\..\WIN32-Code" /I
"..\..\compat" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ws2_32.lib /nologo /subsystem:console /debug /machine:I386
/pdbtype:sept
!ENDIF
diff -uNr libevent-1.4.1-beta/buffer.c libevent-1.4.1-beta-win32/buffer.c
--- libevent-1.4.1-beta/buffer.c Mon Nov 12 05:37:32 2007
+++ libevent-1.4.1-beta-win32/buffer.c Fri Jan 11 08:37:34 2008
@@ -154,8 +154,8 @@
#endif
va_copy(aq, ap);
-#ifdef WIN32
- sz = vsnprintf(buffer, space - 1, fmt, aq);
+#ifdef _WIN32
+ sz = _vsnprintf(buffer, space - 1, fmt, aq);
buffer[space - 1] = '\0';
#else
sz = vsnprintf(buffer, space, fmt, aq);
diff -uNr libevent-1.4.1-beta/devpoll.c libevent-1.4.1-beta-win32/devpoll.c
--- libevent-1.4.1-beta/devpoll.c Fri Dec 14 22:08:14 2007
+++ libevent-1.4.1-beta-win32/devpoll.c Fri Jan 11 08:43:39 2008
@@ -32,8 +32,8 @@
#include <sys/resource.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
-#else
-#include <sys/_time.h>
+//#else
+//#include <sys/_time.h>
#endif
#include <sys/queue.h>
#include <sys/devpoll.h>
diff -uNr libevent-1.4.1-beta/epoll.c libevent-1.4.1-beta-win32/epoll.c
--- libevent-1.4.1-beta/epoll.c Fri Dec 14 22:08:14 2007
+++ libevent-1.4.1-beta-win32/epoll.c Fri Jan 11 08:43:39 2008
@@ -33,8 +33,8 @@
#include <sys/resource.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
-#else
-#include <sys/_time.h>
+//#else
+//#include <sys/_time.h>
#endif
#include <sys/queue.h>
#include <sys/epoll.h>
diff -uNr libevent-1.4.1-beta/evdns.c libevent-1.4.1-beta-win32/evdns.c
--- libevent-1.4.1-beta/evdns.c Sat Dec 22 06:03:54 2007
+++ libevent-1.4.1-beta-win32/evdns.c Fri Jan 11 08:39:23 2008
@@ -106,10 +106,10 @@
#include "evdns.h"
#include "evutil.h"
#include "log.h"
-#ifdef WIN32
+#ifdef _WIN32
#include <winsock2.h>
#include <windows.h>
-#include <iphlpapi.h>
+//#include <iphlpapi.h>
#include <io.h>
#else
#include <sys/socket.h>
diff -uNr libevent-1.4.1-beta/event-config.h
libevent-1.4.1-beta-win32/event-config.h
--- libevent-1.4.1-beta/event-config.h Sun Dec 23 01:05:46 2007
+++ libevent-1.4.1-beta-win32/event-config.h Fri Jan 11 08:36:11 2008
@@ -105,7 +105,7 @@
#define _EVENT_HAVE_STDARG_H 1
/* Define to 1 if you have the <stdint.h> header file. */
-#define _EVENT_HAVE_STDINT_H 1
+//#define _EVENT_HAVE_STDINT_H 1
/* Define to 1 if you have the <stdlib.h> header file. */
#define _EVENT_HAVE_STDLIB_H 1
@@ -156,7 +156,7 @@
#define _EVENT_HAVE_SYS_STAT_H 1
/* Define to 1 if you have the <sys/time.h> header file. */
-#define _EVENT_HAVE_SYS_TIME_H 1
+//#define _EVENT_HAVE_SYS_TIME_H 1
/* Define to 1 if you have the <sys/types.h> header file. */
#define _EVENT_HAVE_SYS_TYPES_H 1
diff -uNr libevent-1.4.1-beta/event-internal.h
libevent-1.4.1-beta-win32/event-internal.h
--- libevent-1.4.1-beta/event-internal.h Fri Dec 14 22:08:14 2007
+++ libevent-1.4.1-beta-win32/event-internal.h Fri Jan 11 16:19:30 2008
@@ -34,6 +34,37 @@
#include "config.h"
#include "min_heap.h"
#include "evsignal.h"
+
+#ifdef _WIN32
+#ifndef NFDBITS
+typedef long int fd_mask;
+#define NFDBITS (8 * sizeof(fd_mask))
+#endif
+#endif
+
+#ifndef timeradd
+# define timeradd(a, b, result) \
+ do { \
+ (result)->tv_sec = (a)->tv_sec + (b)->tv_sec; \
+ (result)->tv_usec = (a)->tv_usec + (b)->tv_usec; \
+ if ((result)->tv_usec >= 1000000) \
+ { \
+ ++(result)->tv_sec; \
+ (result)->tv_usec -= 1000000; \
+ } \
+ } while (0)
+#endif
+#ifndef timersub
+# define timersub(a, b, result) \
+ do { \
+ (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \
+ (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \
+ if ((result)->tv_usec < 0) { \
+ --(result)->tv_sec; \
+ (result)->tv_usec += 1000000; \
+ } \
+ } while (0)
+#endif
struct eventop {
const char *name;
diff -uNr libevent-1.4.1-beta/event.c libevent-1.4.1-beta-win32/event.c
--- libevent-1.4.1-beta/event.c Wed Dec 19 07:50:46 2007
+++ libevent-1.4.1-beta-win32/event.c Fri Jan 11 08:43:39 2008
@@ -37,8 +37,8 @@
#include <sys/types.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
-#else
-#include <sys/_time.h>
+//#else
+//#include <sys/_time.h>
#endif
#include <sys/queue.h>
#include <stdio.h>
diff -uNr libevent-1.4.1-beta/event.h libevent-1.4.1-beta-win32/event.h
--- libevent-1.4.1-beta/event.h Wed Dec 19 07:50:46 2007
+++ libevent-1.4.1-beta-win32/event.h Fri Jan 11 16:19:22 2008
@@ -174,12 +174,19 @@
/* For int types. */
#include <evutil.h>
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <winsock2.h>
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
typedef unsigned char u_char;
typedef unsigned short u_short;
+#endif
+
+#ifdef _MSC_VER
+#ifdef _DEBUG
+#define USE_DEBUG
+#endif
#endif
#define EVLIST_TIMEOUT 0x01
diff -uNr libevent-1.4.1-beta/kqueue.c libevent-1.4.1-beta-win32/kqueue.c
--- libevent-1.4.1-beta/kqueue.c Fri Dec 14 22:08:14 2007
+++ libevent-1.4.1-beta-win32/kqueue.c Fri Jan 11 08:43:39 2008
@@ -33,8 +33,8 @@
#include <sys/types.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
-#else
-#include <sys/_time.h>
+//#else
+//#include <sys/_time.h>
#endif
#include <sys/queue.h>
#include <sys/event.h>
diff -uNr libevent-1.4.1-beta/log.c libevent-1.4.1-beta-win32/log.c
--- libevent-1.4.1-beta/log.c Mon Nov 12 05:37:32 2007
+++ libevent-1.4.1-beta-win32/log.c Fri Jan 11 08:43:39 2008
@@ -50,8 +50,8 @@
#include <sys/types.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
-#else
-#include <sys/_time.h>
+//#else
+//#include <sys/_time.h>
#endif
#include <stdio.h>
#include <stdlib.h>
diff -uNr libevent-1.4.1-beta/poll.c libevent-1.4.1-beta-win32/poll.c
--- libevent-1.4.1-beta/poll.c Tue Dec 18 20:18:40 2007
+++ libevent-1.4.1-beta-win32/poll.c Fri Jan 11 08:43:39 2008
@@ -33,8 +33,8 @@
#include <sys/types.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
-#else
-#include <sys/_time.h>
+//#else
+//#include <sys/_time.h>
#endif
#include <sys/queue.h>
#include <poll.h>
diff -uNr libevent-1.4.1-beta/sample/event-test.c
libevent-1.4.1-beta-win32/sample/event-test.c
--- libevent-1.4.1-beta/sample/event-test.c Tue Dec 18 20:18:40 2007
+++ libevent-1.4.1-beta-win32/sample/event-test.c Fri Jan 11 15:58:05 2008
@@ -9,11 +9,12 @@
#include <sys/types.h>
#include <sys/stat.h>
-#ifndef WIN32
+#ifndef _WIN32
#include <sys/queue.h>
#include <unistd.h>
#include <sys/time.h>
-#else
+#else
+#include <winsock2.h>
#include <windows.h>
#endif
#include <fcntl.h>
diff -uNr libevent-1.4.1-beta/sample/signal-test.c
libevent-1.4.1-beta-win32/sample/signal-test.c
--- libevent-1.4.1-beta/sample/signal-test.c Tue Dec 18 20:18:40 2007
+++ libevent-1.4.1-beta-win32/sample/signal-test.c Fri Jan 11 16:22:52 2008
@@ -14,7 +14,8 @@
#include <sys/queue.h>
#include <unistd.h>
#include <sys/time.h>
#else
+#include <winsock2.h>
#include <windows.h>
#endif
#include <signal.h>
diff -uNr libevent-1.4.1-beta/sample/time-test.c
libevent-1.4.1-beta-win32/sample/time-test.c
--- libevent-1.4.1-beta/sample/time-test.c Tue Dec 18 20:18:40 2007
+++ libevent-1.4.1-beta-win32/sample/time-test.c Fri Jan 11 16:33:26 2008
@@ -36,7 +36,7 @@
struct event *timeout = arg;
int newtime = time(NULL);
- printf("%s: called at %d: %d\n", __func__, newtime,
+ printf("%s: called at %d: %d\n", "timeout_cb", newtime,
newtime - lasttime);
lasttime = newtime;
diff -uNr libevent-1.4.1-beta/select.c libevent-1.4.1-beta-win32/select.c
--- libevent-1.4.1-beta/select.c Tue Dec 18 20:18:40 2007
+++ libevent-1.4.1-beta-win32/select.c Fri Jan 11 08:43:05 2008
@@ -33,8 +33,8 @@
#include <sys/types.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
-#else
-#include <sys/_time.h>
+//#else
+//#include <sys/_time.h>
#endif
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
@@ -43,8 +43,10 @@
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
+#ifndef _WIN32
+#include <unistd.h>
+#endif
#include <errno.h>
#ifdef CHECK_INVARIANTS
#include <assert.h>
_______________________________________________
Libevent-users mailing list
Libevent-users@monkey.org
http://monkeymail.org/mailman/listinfo/libevent-users
