Commit e621c97d authored by Nick Mathewson's avatar Nick Mathewson 🏃
Browse files

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
parent c2e7e037
......@@ -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
......@@ -171,7 +189,6 @@
+)
+
+AM_CONDITIONAL(BUILD_WIN32, test x$bwin32 = xtrue)
+
+
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
......@@ -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) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment