Some tweaks to Brodie Thesfield's MSVC patch.

svn:r1386

diff --git a/WIN32-Code/event-config.h b/WIN32-Code/event-config.h
index 6c85329b15a3f2e09ebe64eb06e64a057f26aa2a..0fd5d3f1e6e813c77bf27d5b5f785022e3710104 100644 (file)
--- a/WIN32-Code/event-config.h
+++ b/WIN32-Code/event-config.h
@@ -332,8 +332,6 @@
 #define _EVENT_socklen_t unsigned int
 
 /* Define to `int' if <sys/types.h> does not define. */
-#define _EVENT_ssize_t intptr_t
-
-#define ssize_t SSIZE_T
+#define _EVENT_ssize_t SSIZE_T
 
 #endif

diff --git a/WIN32-Code/win32.c b/WIN32-Code/win32.c
index 6c8ba2171139b698a22e04d333cfe01aba1426df..470558858fd920820d41bdca077164d3a9657c1c 100644 (file)
--- a/WIN32-Code/win32.c
+++ b/WIN32-Code/win32.c
@@ -334,7 +334,7 @@ win32_dispatch(struct event_base *base, struct timeval *tv)
                }
        }
        if (win32op->writeset_out->fd_count) {
-        SOCKET s;
+               SOCKET s;
                i = rand() % win32op->writeset_out->fd_count;
                for (j=0; j<win32op->writeset_out->fd_count; ++j) {
                        if (++i >= win32op->writeset_out->fd_count)

diff --git a/event_rpcgen.py b/event_rpcgen.py
index 136d6a83b6830b8a65fe48c251521ea760df4a96..6b8f5fa95caea8861986bda9ceedc3bb2fda6ed1 100755 (executable)
--- a/event_rpcgen.py
+++ b/event_rpcgen.py
@@ -1561,9 +1561,13 @@ class CCodeGenerator:
         pre += ( '#include <stdlib.h>\n'
                  '#include <string.h>\n'
                  '#include <assert.h>\n'
+                 '#include <event-config.h>\n'
                  '#include <event2/event.h>\n'
                  '#include <event2/buffer.h>\n'
                  '#include <event2/tag.h>\n\n'
+                 '#ifdef _EVENT___func__\n'
+                 '#define __func__ _EVENT___FUNC__\n'
+                 '#endif\n\n'
                  )
 
         for statement in cppdirect:

diff --git a/test/regress_dns.c b/test/regress_dns.c
index 5b74fc4ad6476cc844dbd40873d2b0a2d62455f8..c535006e2dc2b54c364c363d2593fd0740a22dd2 100644 (file)
--- a/test/regress_dns.c
+++ b/test/regress_dns.c
@@ -70,6 +70,9 @@ static int dns_ok = 0;
 static int dns_got_cancel = 0;
 static int dns_err = 0;
 
+/* XXXXX have evutil export this. */
+int evutil_strcasecmp(const char *, const char *);
+
 static void
 dns_gethostbyname_cb(int result, char type, int count, int ttl,
     void *addresses, void *arg)

diff --git a/test/regress_main.c b/test/regress_main.c
index 3f2a23916d3e02c6ed95299b5677a18d4c6793ee..4bb0e694b93ec787d9b5f05f47de4564868d81a7 100644 (file)
--- a/test/regress_main.c
+++ b/test/regress_main.c
@@ -28,13 +28,16 @@
 #ifdef WIN32
 #include <winsock2.h>
 #include <windows.h>
-#define __func__    __FUNCTION__
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "event-config.h"
 #endif
 
+#ifdef _EVENT___func__
+#define __func__ _EVENT___func__
+#endif
+
 #if 0
 #include <sys/types.h>
 #include <sys/stat.h>