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
This commit is contained in:
Nick Mathewson 2009-11-03 19:15:27 +00:00
parent 756c4cd394
commit 6ce14fd01c
10 changed files with 9 additions and 8 deletions

View File

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

View File

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

View File

@ -33,7 +33,7 @@
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#else
#include <sys/_time.h>
#include <sys/_libevent_time.h>
#endif
#include <sys/queue.h>
#include <sys/devpoll.h>

View File

@ -34,7 +34,7 @@
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#else
#include <sys/_time.h>
#include <sys/_libevent_time.h>
#endif
#include <sys/queue.h>
#include <sys/epoll.h>

View File

@ -37,7 +37,7 @@
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#else
#include <sys/_time.h>
#include <sys/_libevent_time.h>
#endif
#include <sys/queue.h>
#include <stdio.h>

View File

@ -34,7 +34,7 @@
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#else
#include <sys/_time.h>
#include <sys/_libevent_time.h>
#endif
#include <sys/queue.h>
#include <sys/event.h>

2
log.c
View File

@ -50,7 +50,7 @@
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#else
#include <sys/_time.h>
#include <sys/_libevent_time.h>
#endif
#include <stdio.h>
#include <stdlib.h>

2
poll.c
View File

@ -34,7 +34,7 @@
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#else
#include <sys/_time.h>
#include <sys/_libevent_time.h>
#endif
#include <sys/queue.h>
#include <poll.h>

View File

@ -34,7 +34,7 @@
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#else
#include <sys/_time.h>
#include <sys/_libevent_time.h>
#endif
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>