cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-17 08:17:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #297 from billsegall/master

Browse Source 
The Windows socket type is defined as SOCKET.
This commit is contained in:
Mark Ellzey 2015-12-18 12:17:04 -08:00
commit f264afbc9d
4 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.nmake
View File

@ -25,6 +25,9 @@ CFLAGS=/IWIN32-Code /IWIN32-Code/nmake /Iinclude /Icompat /DHAVE_CONFIG_H /I. $(
# For optimization and warnings # For optimization and warnings
CFLAGS=$(CFLAGS) /Ox /W3 /wd4996 /nologo CFLAGS=$(CFLAGS) /Ox /W3 /wd4996 /nologo
# Add BUILD_CFLAGS from the environment
CFLAGS=$(CFLAGS) $(BUILD_CFLAGS)
# XXXX have a debug mode # XXXX have a debug mode
LIBFLAGS=/nologo LIBFLAGS=/nologo
@ -48,7 +51,6 @@ SSL_LIBS=
ALL_OBJS=$(CORE_OBJS) $(WIN_OBJS) $(EXTRA_OBJS) $(SSL_OBJS) ALL_OBJS=$(CORE_OBJS) $(WIN_OBJS) $(EXTRA_OBJS) $(SSL_OBJS)
STATIC_LIBS=libevent_core.lib libevent_extras.lib libevent.lib $(SSL_LIBS) STATIC_LIBS=libevent_core.lib libevent_extras.lib libevent.lib $(SSL_LIBS)
all: static_libs tests all: static_libs tests
static_libs: $(STATIC_LIBS) static_libs: $(STATIC_LIBS)

26
buildall.bat Normal file
View File

@ -0,0 +1,26 @@
nmake -f Makefile.nmake clean
set BUILD_CFLAGS=/MT
nmake -f Makefile.nmake
mkdir lib\MT\Release
move libev*.lib lib\MT\Release
nmake -f Makefile.nmake clean
set BUILD_CFLAGS=/MTd
nmake -f Makefile.nmake
mkdir lib\MT\Debug
move libev*.lib lib\MT\Debug
nmake -f Makefile.nmake clean
set BUILD_CFLAGS=/MD
nmake -f Makefile.nmake
mkdir lib\MD\Release
move libev*.lib lib\MD\Release
nmake -f Makefile.nmake clean
set BUILD_CFLAGS=/MDd
nmake -f Makefile.nmake
mkdir lib\MD\Debug
move libev*.lib lib\MD\Debug
nmake -f Makefile.nmake clean

4
include/event2/util.h
View File

@ -300,9 +300,9 @@ extern "C" {
/** /**
* A type wide enough to hold the output of "socket()" or "accept()". On * A type wide enough to hold the output of "socket()" or "accept()". On
* Windows, this is an intptr_t; elsewhere, it is an int. */ * Windows, this is an SOCKET; elsewhere, it is an int. */
#ifdef _WIN32 #ifdef _WIN32
#define evutil_socket_t intptr_t #define evutil_socket_t SOCKET
#else #else
#define evutil_socket_t int #define evutil_socket_t int
#endif #endif

3
test/Makefile.nmake
View File

@ -14,6 +14,9 @@ CFLAGS=/I.. /I../WIN32-Code /I../WIN32-Code/nmake /I../include /I../compat /DHAV
CFLAGS=$(CFLAGS) /Ox /W3 /wd4996 /nologo CFLAGS=$(CFLAGS) /Ox /W3 /wd4996 /nologo
# Add BUILD_CFLAGS from the environment
CFLAGS=$(CFLAGS) $(BUILD_CFLAGS)
REGRESS_OBJS=regress.obj regress_buffer.obj regress_http.obj regress_dns.obj \ REGRESS_OBJS=regress.obj regress_buffer.obj regress_http.obj regress_dns.obj \
regress_testutils.obj \ regress_testutils.obj \
regress_rpc.obj regress.gen.obj \ regress_rpc.obj regress.gen.obj \