From 6ce14fd01c47be08142c3d5fb6f86eb80d65e844 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 3 Nov 2009 19:15:27 +0000 Subject: [PATCH] Rename compat/sys/_time.h to compat/sys/_libevent_time.h On some systems (notably HPUX), there is already a /usr/include/sys/_time.h, which our sys/_time.h shadows. Found and diagnosed by Kathryn Hogg. This is a quick fix for 1.4 only; for 2.0, I want to eliminate compat/sys/_time.h entirely, and have util-internal subsume it. svn:r1493 --- ChangeLog | 1 + Makefile.am | 2 +- compat/sys/{_time.h => _libevent_time.h} | 0 devpoll.c | 2 +- epoll.c | 2 +- event.c | 2 +- kqueue.c | 2 +- log.c | 2 +- poll.c | 2 +- select.c | 2 +- 10 files changed, 9 insertions(+), 8 deletions(-) rename compat/sys/{_time.h => _libevent_time.h} (100%) diff --git a/ChangeLog b/ChangeLog index f8484400..71853571 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ Changes in 1.4.13-stable: o Do not allocate the maximum event queue and fd array for the epoll backend at startup. Instead, start out accepting 32 events at a time, and double the queue's size when it seems that the OS is generating events faster than we're requesting them. Saves up to 512K per epoll-based event_base. Resolves bug 2839240. o Fix compilation on Android, which forgot to define fd_mask in its sys/select.h o Do not drop data from evbuffer when out of memory; reported by Jacek Masiulaniec + o Rename our replacement compat/sys/_time.h header to avoid build a conflict on HPUX; reported by Kathryn Hogg. Changes in 1.4.12-stable: diff --git a/Makefile.am b/Makefile.am index 8d9d7520..dc78ef17 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,7 +44,7 @@ EXTRA_DIST = autogen.sh event.h event-internal.h log.h evsignal.h evdns.3 \ test/Makefile.am test/Makefile.in test/bench.c test/regress.c \ test/test-eof.c test/test-weof.c test/test-time.c \ test/test-init.c test/test.sh \ - compat/sys/queue.h compat/sys/_time.h \ + compat/sys/queue.h compat/sys/_libevent_time.h \ WIN32-Code/config.h \ WIN32-Code/event-config.h \ WIN32-Code/win32.c \ diff --git a/compat/sys/_time.h b/compat/sys/_libevent_time.h similarity index 100% rename from compat/sys/_time.h rename to compat/sys/_libevent_time.h diff --git a/devpoll.c b/devpoll.c index cbd27309..985e589b 100644 --- a/devpoll.c +++ b/devpoll.c @@ -33,7 +33,7 @@ #ifdef HAVE_SYS_TIME_H #include #else -#include +#include #endif #include #include diff --git a/epoll.c b/epoll.c index 883f0d6b..d6028794 100644 --- a/epoll.c +++ b/epoll.c @@ -34,7 +34,7 @@ #ifdef HAVE_SYS_TIME_H #include #else -#include +#include #endif #include #include diff --git a/event.c b/event.c index 30480abf..ce57a221 100644 --- a/event.c +++ b/event.c @@ -37,7 +37,7 @@ #ifdef HAVE_SYS_TIME_H #include #else -#include +#include #endif #include #include diff --git a/kqueue.c b/kqueue.c index 36eebe5f..ca7df1c0 100644 --- a/kqueue.c +++ b/kqueue.c @@ -34,7 +34,7 @@ #ifdef HAVE_SYS_TIME_H #include #else -#include +#include #endif #include #include diff --git a/log.c b/log.c index b62a6191..48ebb269 100644 --- a/log.c +++ b/log.c @@ -50,7 +50,7 @@ #ifdef HAVE_SYS_TIME_H #include #else -#include +#include #endif #include #include diff --git a/poll.c b/poll.c index 5d496618..637c172b 100644 --- a/poll.c +++ b/poll.c @@ -34,7 +34,7 @@ #ifdef HAVE_SYS_TIME_H #include #else -#include +#include #endif #include #include diff --git a/select.c b/select.c index ac826fd7..156df833 100644 --- a/select.c +++ b/select.c @@ -34,7 +34,7 @@ #ifdef HAVE_SYS_TIME_H #include #else -#include +#include #endif #ifdef HAVE_SYS_SELECT_H #include