From 784b8773a452f36a68b71a42104e241074d208ee Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 6 Nov 2009 21:46:57 +0000 Subject: [PATCH] We do not work any more without an event-config.h; stop pretending that it is meaningful to check for HAVE_CONFIG_H svn:r1516 --- buffer.c | 2 -- bufferevent.c | 2 -- bufferevent_filter.c | 2 -- bufferevent_openssl.c | 2 -- bufferevent_pair.c | 2 -- bufferevent_sock.c | 2 -- devpoll.c | 2 -- epoll.c | 2 -- evdns.c | 2 -- event.c | 2 -- event_tagging.c | 2 -- evmap.c | 2 -- evport.c | 2 -- evrpc.c | 2 -- evthread_pthread.c | 2 -- evthread_win32.c | 2 -- evutil.c | 3 +-- http.c | 3 +-- kqueue.c | 2 -- listener.c | 2 -- log.c | 2 -- poll.c | 2 -- sample/event-test.c | 4 +--- sample/signal-test.c | 4 +--- sample/time-test.c | 4 +--- select.c | 2 -- signal.c | 2 -- strlcpy-internal.h | 2 -- strlcpy.c | 2 -- test/bench.c | 2 -- test/bench_cascade.c | 2 -- test/bench_http.c | 2 -- test/regress.c | 2 -- test/regress_buffer.c | 2 -- test/regress_bufferevent.c | 2 -- test/regress_dns.c | 2 -- test/regress_http.c | 2 -- test/regress_main.c | 2 -- test/regress_pthread.c | 2 -- test/regress_rpc.c | 2 -- test/regress_util.c | 3 +-- test/regress_zlib.c | 2 -- test/test-eof.c | 3 --- test/test-init.c | 3 --- test/test-time.c | 3 --- test/test-weof.c | 3 --- 46 files changed, 6 insertions(+), 99 deletions(-) diff --git a/buffer.c b/buffer.c index bcfedb8e..8bd37d6e 100644 --- a/buffer.c +++ b/buffer.c @@ -25,9 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #ifdef WIN32 #include diff --git a/bufferevent.c b/bufferevent.c index 4de9b1e9..f291f29f 100644 --- a/bufferevent.c +++ b/bufferevent.c @@ -27,9 +27,7 @@ #include -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #ifdef _EVENT_HAVE_SYS_TIME_H #include diff --git a/bufferevent_filter.c b/bufferevent_filter.c index 33f4d352..7002b05e 100644 --- a/bufferevent_filter.c +++ b/bufferevent_filter.c @@ -28,9 +28,7 @@ #include -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #ifdef _EVENT_HAVE_SYS_TIME_H #include diff --git a/bufferevent_openssl.c b/bufferevent_openssl.c index ba8e7f95..72537c19 100644 --- a/bufferevent_openssl.c +++ b/bufferevent_openssl.c @@ -26,9 +26,7 @@ #include -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #ifdef _EVENT_HAVE_SYS_TIME_H #include diff --git a/bufferevent_pair.c b/bufferevent_pair.c index 3d1a1670..63182759 100644 --- a/bufferevent_pair.c +++ b/bufferevent_pair.c @@ -30,9 +30,7 @@ #include #endif -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #include "event2/util.h" #include "event2/buffer.h" diff --git a/bufferevent_sock.c b/bufferevent_sock.c index 0b15b6b1..f3551a3f 100644 --- a/bufferevent_sock.c +++ b/bufferevent_sock.c @@ -28,9 +28,7 @@ #include -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #ifdef _EVENT_HAVE_SYS_TIME_H #include diff --git a/devpoll.c b/devpoll.c index 25664fa7..638b32d9 100644 --- a/devpoll.c +++ b/devpoll.c @@ -23,9 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #include #include diff --git a/epoll.c b/epoll.c index 70e8eb3e..7ac5b96e 100644 --- a/epoll.c +++ b/epoll.c @@ -24,9 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #include #include diff --git a/evdns.c b/evdns.c index 6293b0d6..3c562dc9 100644 --- a/evdns.c +++ b/evdns.c @@ -35,9 +35,7 @@ */ #include -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #ifdef _EVENT_DNS_USE_FTIME_FOR_ID #include diff --git a/event.c b/event.c index d59fe5bb..d8b7b1bc 100644 --- a/event.c +++ b/event.c @@ -24,9 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #ifdef WIN32 #include diff --git a/event_tagging.c b/event_tagging.c index f1d7a992..bbd0f07b 100644 --- a/event_tagging.c +++ b/event_tagging.c @@ -24,9 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #ifdef _EVENT_HAVE_SYS_TYPES_H #include diff --git a/evmap.c b/evmap.c index 32443472..00cb80e2 100644 --- a/evmap.c +++ b/evmap.c @@ -23,9 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #ifdef WIN32 #include diff --git a/evport.c b/evport.c index 4c521503..f293f31b 100644 --- a/evport.c +++ b/evport.c @@ -50,9 +50,7 @@ * As in the select(2) implementation, signals are handled by evsignal. */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #include #include diff --git a/evrpc.c b/evrpc.c index c022cb29..e05972c3 100644 --- a/evrpc.c +++ b/evrpc.c @@ -24,9 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #ifdef WIN32 #define WIN32_LEAN_AND_MEAN diff --git a/evthread_pthread.c b/evthread_pthread.c index 0263c747..a76f4296 100644 --- a/evthread_pthread.c +++ b/evthread_pthread.c @@ -23,9 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif /* With glibc we need to define this to get PTHREAD_MUTEX_RECURSIVE. */ #define _GNU_SOURCE diff --git a/evthread_win32.c b/evthread_win32.c index 9d37da3f..5e341f88 100644 --- a/evthread_win32.c +++ b/evthread_win32.c @@ -23,9 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #ifdef WIN32 #include diff --git a/evutil.c b/evutil.c index 39d40b10..5a57c288 100644 --- a/evutil.c +++ b/evutil.c @@ -23,9 +23,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H + #include "event-config.h" -#endif #ifdef WIN32 #include diff --git a/http.c b/http.c index c1e16e5a..8ad4523e 100644 --- a/http.c +++ b/http.c @@ -25,9 +25,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif + #define _REENTRANT #ifdef _EVENT_HAVE_SYS_PARAM_H diff --git a/kqueue.c b/kqueue.c index 7a92bbda..7334ab33 100644 --- a/kqueue.c +++ b/kqueue.c @@ -26,9 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #define _GNU_SOURCE diff --git a/listener.c b/listener.c index 7e49ed0d..c65538fa 100644 --- a/listener.c +++ b/listener.c @@ -26,9 +26,7 @@ #include -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #ifdef WIN32 #include diff --git a/log.c b/log.c index 4bf22d04..9c97ace8 100644 --- a/log.c +++ b/log.c @@ -37,9 +37,7 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #ifdef WIN32 #include diff --git a/poll.c b/poll.c index e11699ce..d87bbdc6 100644 --- a/poll.c +++ b/poll.c @@ -26,9 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #include #ifdef _EVENT_HAVE_SYS_TIME_H diff --git a/sample/event-test.c b/sample/event-test.c index 3a06d3bf..b530e8fa 100644 --- a/sample/event-test.c +++ b/sample/event-test.c @@ -3,9 +3,7 @@ * cc -I/usr/local/include -o event-test event-test.c -L/usr/local/lib -levent */ -#ifdef HAVE_CONFIG_H -#include "event-config.h" -#endif +#include #include #include diff --git a/sample/signal-test.c b/sample/signal-test.c index 4a3a738e..f6316839 100644 --- a/sample/signal-test.c +++ b/sample/signal-test.c @@ -6,9 +6,7 @@ #include -#ifdef HAVE_CONFIG_H -#include "event-config.h" -#endif +#include #include #ifndef WIN32 diff --git a/sample/time-test.c b/sample/time-test.c index 82612b69..098ed86f 100644 --- a/sample/time-test.c +++ b/sample/time-test.c @@ -5,9 +5,7 @@ #include -#ifdef HAVE_CONFIG_H -#include "event-config.h" -#endif +#include #include #ifndef WIN32 diff --git a/select.c b/select.c index 4ec21e57..63f2b6e8 100644 --- a/select.c +++ b/select.c @@ -26,9 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #include #ifdef _EVENT_HAVE_SYS_TIME_H diff --git a/signal.c b/signal.c index 07126088..3cf45f2b 100644 --- a/signal.c +++ b/signal.c @@ -26,9 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #ifdef WIN32 #define WIN32_LEAN_AND_MEAN diff --git a/strlcpy-internal.h b/strlcpy-internal.h index 12f09a38..358daae7 100644 --- a/strlcpy-internal.h +++ b/strlcpy-internal.h @@ -5,9 +5,7 @@ extern "C" { #endif -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif /* HAVE_CONFIG_H */ #ifndef _EVENT_HAVE_STRLCPY #include diff --git a/strlcpy.c b/strlcpy.c index 7fd0884a..51c37dd1 100644 --- a/strlcpy.c +++ b/strlcpy.c @@ -33,9 +33,7 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp #include -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif /* HAVE_CONFIG_H */ #ifndef _EVENT_HAVE_STRLCPY #include "strlcpy-internal.h" diff --git a/test/bench.c b/test/bench.c index 9e57d16a..570897b4 100644 --- a/test/bench.c +++ b/test/bench.c @@ -33,9 +33,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #include #include diff --git a/test/bench_cascade.c b/test/bench_cascade.c index 59cbc50f..0990c75e 100644 --- a/test/bench_cascade.c +++ b/test/bench_cascade.c @@ -25,9 +25,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #include #include diff --git a/test/bench_http.c b/test/bench_http.c index 26088074..1f67698a 100644 --- a/test/bench_http.c +++ b/test/bench_http.c @@ -25,9 +25,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #include #include diff --git a/test/regress.c b/test/regress.c index 8a984b34..85cfa11f 100644 --- a/test/regress.c +++ b/test/regress.c @@ -30,9 +30,7 @@ #include #endif -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #include #include diff --git a/test/regress_buffer.c b/test/regress_buffer.c index 59ad45ba..3421b922 100644 --- a/test/regress_buffer.c +++ b/test/regress_buffer.c @@ -30,9 +30,7 @@ #include #endif -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #include #include diff --git a/test/regress_bufferevent.c b/test/regress_bufferevent.c index 98e70434..334261de 100644 --- a/test/regress_bufferevent.c +++ b/test/regress_bufferevent.c @@ -30,9 +30,7 @@ #include #endif -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #include #include diff --git a/test/regress_dns.c b/test/regress_dns.c index 348bcb42..7bd33866 100644 --- a/test/regress_dns.c +++ b/test/regress_dns.c @@ -31,9 +31,7 @@ #include #endif -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #include #include diff --git a/test/regress_http.c b/test/regress_http.c index 2fa58b8b..6bff6af7 100644 --- a/test/regress_http.c +++ b/test/regress_http.c @@ -30,9 +30,7 @@ #include #endif -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #include #include diff --git a/test/regress_main.c b/test/regress_main.c index f2528025..781f1c4d 100644 --- a/test/regress_main.c +++ b/test/regress_main.c @@ -30,9 +30,7 @@ #include #endif -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #ifdef _EVENT___func__ #define __func__ _EVENT___func__ diff --git a/test/regress_pthread.c b/test/regress_pthread.c index 3010e4e7..acfd4327 100644 --- a/test/regress_pthread.c +++ b/test/regress_pthread.c @@ -24,9 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #include #include diff --git a/test/regress_rpc.c b/test/regress_rpc.c index 877d227d..73462c65 100644 --- a/test/regress_rpc.c +++ b/test/regress_rpc.c @@ -30,9 +30,7 @@ #include #endif -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #include #include diff --git a/test/regress_util.c b/test/regress_util.c index 55aba1fe..092058e6 100644 --- a/test/regress_util.c +++ b/test/regress_util.c @@ -29,9 +29,8 @@ #include #endif -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif + #ifndef WIN32 #include #include diff --git a/test/regress_zlib.c b/test/regress_zlib.c index 25cba6df..148240df 100644 --- a/test/regress_zlib.c +++ b/test/regress_zlib.c @@ -29,9 +29,7 @@ #include #endif -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif #include #ifndef WIN32 diff --git a/test/test-eof.c b/test/test-eof.c index 0c17093b..47c6c8b0 100644 --- a/test/test-eof.c +++ b/test/test-eof.c @@ -2,10 +2,7 @@ * Compile with: * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif - #ifdef WIN32 #include diff --git a/test/test-init.c b/test/test-init.c index b622217d..68ad561a 100644 --- a/test/test-init.c +++ b/test/test-init.c @@ -2,10 +2,7 @@ * Compile with: * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif - #include #include diff --git a/test/test-time.c b/test/test-time.c index cf96bf5e..a50d2957 100644 --- a/test/test-time.c +++ b/test/test-time.c @@ -2,10 +2,7 @@ * Compile with: * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif - #include #include diff --git a/test/test-weof.c b/test/test-weof.c index a2a7eb32..6dc752e1 100644 --- a/test/test-weof.c +++ b/test/test-weof.c @@ -2,10 +2,7 @@ * Compile with: * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent */ -#ifdef HAVE_CONFIG_H #include "event-config.h" -#endif - #ifdef WIN32 #include -- 2.50.1