diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-09-22 01:23:28 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-09-22 01:23:28 +0000 |
| commit | e621c97d6eae5b050e571ff9033460f0cf3208e4 (patch) | |
| tree | a18d82f2753850c853b7121d2755dc8bc7e5605f /Win32Build | |
| parent | c2e7e0374e0cf1a20a0e2bf7842ea4bd0869a008 (diff) | |
| download | tor-e621c97d6eae5b050e571ff9033460f0cf3208e4.tar.gz tor-e621c97d6eae5b050e571ff9033460f0cf3208e4.zip | |
r8906@Kushana: nickm | 2006-09-21 21:23:22 -0400
Revise patch for libevent 1.1b to handle the "wait, I *do* have a gettimeofday()" case.
svn:r8456
Diffstat (limited to 'Win32Build')
| -rw-r--r-- | Win32Build/mingw/libevent-1.1b-mingw.diff | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/Win32Build/mingw/libevent-1.1b-mingw.diff b/Win32Build/mingw/libevent-1.1b-mingw.diff index 41c4850441..c7cea5b326 100644 --- a/Win32Build/mingw/libevent-1.1b-mingw.diff +++ b/Win32Build/mingw/libevent-1.1b-mingw.diff @@ -59,18 +59,36 @@ /**************************************************************************** * * Function: gettimeofday(struct timeval *, struct timezone *) +@@ -17,6 +23,7 @@ + * + ****************************************************************************/ + ++#ifndef HAVE_GETTIMEOFDAY + int gettimeofday(struct timeval *tv, struct timezone *tz) { + struct _timeb tb; + +@@ -28,6 +35,7 @@ + tv->tv_usec = ((int) tb.millitm) * 1000; + return 0; + } ++#endif + + int + win_read(int fd, void *buf, unsigned int length) === WIN32-Code/misc.h ================================================================== --- WIN32-Code/misc.h (revision 8794) +++ WIN32-Code/misc.h (local) -@@ -1,6 +1,9 @@ +@@ -1,6 +1,11 @@ #ifndef MISC_H #define MISC_H +struct timezone; +struct timeval; + ++#ifndef HAVE_GETTIMEOFDAY int gettimeofday(struct timeval *,struct timezone *); ++#endif #endif === WIN32-Code/win32.c @@ -153,7 +171,7 @@ ================================================================== --- configure.in (revision 8794) +++ configure.in (local) -@@ -111,6 +111,22 @@ +@@ -111,6 +111,21 @@ ) fi @@ -172,7 +190,6 @@ + +AM_CONDITIONAL(BUILD_WIN32, test x$bwin32 = xtrue) + -+ dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_C_INLINE @@ -180,7 +197,7 @@ ================================================================== --- evbuffer.c (revision 8794) +++ evbuffer.c (local) -@@ -154,12 +153,20 @@ +@@ -154,12 +154,20 @@ if (EVBUFFER_LENGTH(bufev->output)) { res = evbuffer_write(bufev->output, fd); if (res == -1) { |