Revert "The Windows socket type is defined as SOCKET."

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

diff --git a/buildall.bat b/buildall.bat
deleted file mode 100644 (file)
index 3b537d0..0000000
--- a/buildall.bat
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-

diff --git a/include/event2/util.h b/include/event2/util.h
index 47391565be95687b335fd1c0673f11ee20754948..3936786ec982e17b6261d02bc7c16cad4951be79 100644 (file)
--- a/include/event2/util.h
+++ b/include/event2/util.h
@@ -300,9 +300,9 @@ extern "C" {
 
 /**
  * A type wide enough to hold the output of "socket()" or "accept()".  On
- * Windows, this is an SOCKET; elsewhere, it is an int. */
+ * Windows, this is an intptr_t; elsewhere, it is an int. */
 #ifdef _WIN32
-#define evutil_socket_t SOCKET
+#define evutil_socket_t intptr_t
 #else
 #define evutil_socket_t int
 #endif

diff --git a/test/Makefile.nmake b/test/Makefile.nmake
index 54b15cdb06e2fed0649b0c5f8cc501d0f8323b96..30c3eb792bcea62ffbf7479bc8af5a26b1b1a25d 100644 (file)
--- a/test/Makefile.nmake
+++ b/test/Makefile.nmake
@@ -14,9 +14,6 @@ CFLAGS=/I.. /I../WIN32-Code /I../WIN32-Code/nmake /I../include /I../compat /DHAV
 
 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_testutils.obj \
         regress_rpc.obj regress.gen.obj \