Some tweaks to Brodie Thesfield's MSVC patch.

svn:r1386
This commit is contained in:
Nick Mathewson 2009-07-28 19:41:48 +00:00
parent 5b5b880be7
commit a826a75800
5 changed files with 13 additions and 5 deletions

View File

@ -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

View File

@ -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)

View File

@ -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:

View File

@ -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)

View File

@ -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>