From: Niels Provos Date: Thu, 1 Mar 2007 06:25:18 +0000 (+0000) Subject: rolling back r339: evconfig.h does not work X-Git-Tag: release-2.0.1-alpha~637 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b5d2f9a255dbd5eb7d650cd8d829fb85c9c69f2c;p=libevent rolling back r339: evconfig.h does not work svn:r341 --- diff --git a/Makefile.am b/Makefile.am index 5a15ce3e..2739922e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,7 @@ EXTRA_DIST = acconfig.h event.h event-internal.h log.h evsignal.h evdns.3 \ 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/tree.h compat/sys/_time.h \ - WIN32-Code/evconfig.h WIN32-Code/misc.c \ + WIN32-Code/config.h WIN32-Code/misc.c \ WIN32-Code/win32.c WIN32-Code/misc.h \ WIN32-Prj/event_test/event_test.dsp \ WIN32-Prj/event_test/test.txt WIN32-Prj/libevent.dsp \ @@ -46,7 +46,7 @@ libevent_la_SOURCES = event.c buffer.c evbuffer.c log.c event_tagging.c \ libevent_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS) libevent_la_LDFLAGS = -release @VERSION@ -version-info 1:3:0 -include_HEADERS = event.h evhttp.h evdns.h evconfig.h +include_HEADERS = event.h evhttp.h evdns.h INCLUDES = -Icompat $(SYS_INCLUDES) diff --git a/WIN32-Code/evconfig.h b/WIN32-Code/config.h similarity index 100% rename from WIN32-Code/evconfig.h rename to WIN32-Code/config.h diff --git a/WIN32-Code/win32.c b/WIN32-Code/win32.c index 2ba0ae45..867d1f22 100644 --- a/WIN32-Code/win32.c +++ b/WIN32-Code/win32.c @@ -26,10 +26,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifdef _MSC_VER -#include "evconfig.h" +#include "config.h" #else /* Avoid the windows/msvc thing. */ -#include "../evconfig.h" +#include "../config.h" #endif #include diff --git a/WIN32-Prj/libevent.dsp b/WIN32-Prj/libevent.dsp index 67e71c8a..61e9bc84 100644 --- a/WIN32-Prj/libevent.dsp +++ b/WIN32-Prj/libevent.dsp @@ -109,7 +109,7 @@ SOURCE=..\acconfig.h # End Source File # Begin Source File -SOURCE="..\WIN32-Code\evconfig.h" +SOURCE="..\WIN32-Code\config.h" # End Source File # Begin Source File diff --git a/buffer.c b/buffer.c index d33e9292..77efd0cf 100644 --- a/buffer.c +++ b/buffer.c @@ -26,7 +26,7 @@ */ #ifdef HAVE_CONFIG_H -#include "evconfig.h" +#include "config.h" #endif #ifdef HAVE_VASPRINTF diff --git a/configure.in b/configure.in index bf5031f2..c4faf015 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ dnl Dug Song AC_INIT(event.c) AM_INIT_AUTOMAKE(libevent,1.3a) -AM_CONFIG_HEADER(evconfig.h) +AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE dnl Initialize prefix. diff --git a/devpoll.c b/devpoll.c index 359946c2..db897a9d 100644 --- a/devpoll.c +++ b/devpoll.c @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifdef HAVE_CONFIG_H -#include "evconfig.h" +#include "config.h" #endif #include diff --git a/epoll.c b/epoll.c index 0d18d762..e089e23d 100644 --- a/epoll.c +++ b/epoll.c @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifdef HAVE_CONFIG_H -#include "evconfig.h" +#include "config.h" #endif #include diff --git a/evbuffer.c b/evbuffer.c index ed4f3c37..52712bce 100644 --- a/evbuffer.c +++ b/evbuffer.c @@ -28,7 +28,7 @@ #include #ifdef HAVE_CONFIG_H -#include "evconfig.h" +#include "config.h" #endif #ifdef HAVE_SYS_TIME_H diff --git a/evdns.c b/evdns.c index 67c23dbb..b1e0644e 100644 --- a/evdns.c +++ b/evdns.c @@ -36,7 +36,7 @@ #include #ifdef HAVE_CONFIG_H -#include "evconfig.h" +#include "config.h" #endif #ifdef WIN32 diff --git a/event.c b/event.c index 0a897076..f6d2b1cc 100644 --- a/event.c +++ b/event.c @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifdef HAVE_CONFIG_H -#include "evconfig.h" +#include "config.h" #endif #ifdef WIN32 diff --git a/event.h b/event.h index 419f3407..3f2032dd 100644 --- a/event.h +++ b/event.h @@ -31,7 +31,6 @@ extern "C" { #endif -#include #include #ifdef WIN32 diff --git a/event_tagging.c b/event_tagging.c index 91f903a3..6b127243 100644 --- a/event_tagging.c +++ b/event_tagging.c @@ -29,7 +29,7 @@ #include #ifdef HAVE_CONFIG_H -#include "evconfig.h" +#include "config.h" #endif #ifdef WIN32 diff --git a/evport.c b/evport.c index 818385b1..89bbd1ed 100644 --- a/evport.c +++ b/evport.c @@ -52,7 +52,7 @@ */ #ifdef HAVE_CONFIG_H -#include "evconfig.h" +#include "config.h" #endif #ifdef HAVE_SYS_TIME_H diff --git a/evrpc.c b/evrpc.c index de3ac0df..d575cd14 100644 --- a/evrpc.c +++ b/evrpc.c @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifdef HAVE_CONFIG_H -#include "evconfig.h" +#include "config.h" #endif #ifdef WIN32 diff --git a/http.c b/http.c index 6b8ea6db..6ff181de 100644 --- a/http.c +++ b/http.c @@ -29,7 +29,7 @@ #include #ifdef HAVE_CONFIG_H -#include "evconfig.h" +#include "config.h" #endif #ifdef HAVE_SYS_TIME_H diff --git a/kqueue.c b/kqueue.c index 1752c9d8..08369c6d 100644 --- a/kqueue.c +++ b/kqueue.c @@ -27,7 +27,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifdef HAVE_CONFIG_H -#include "evconfig.h" +#include "config.h" #endif #include diff --git a/log.c b/log.c index 0aacbae6..c9275e36 100644 --- a/log.c +++ b/log.c @@ -38,7 +38,7 @@ */ #ifdef HAVE_CONFIG_H -#include "evconfig.h" +#include "config.h" #endif #ifdef WIN32 diff --git a/poll.c b/poll.c index b51c3d46..14ca8453 100644 --- a/poll.c +++ b/poll.c @@ -27,7 +27,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifdef HAVE_CONFIG_H -#include "evconfig.h" +#include "config.h" #endif #include diff --git a/rtsig.c b/rtsig.c index 09ff0658..29aade69 100644 --- a/rtsig.c +++ b/rtsig.c @@ -148,7 +148,7 @@ #ifdef HAVE_CONFIG_H -#include "evconfig.h" +#include "config.h" #endif /* Enable F_SETSIG and F_SETOWN */ diff --git a/sample/Makefile.am b/sample/Makefile.am index 2e3a3457..b749b806 100644 --- a/sample/Makefile.am +++ b/sample/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies LDADD = ../libevent.la CPPFPLAGS = -I.. -CFLAGS = -I../compat -I.. +CFLAGS = -I../compat noinst_PROGRAMS = event-test time-test signal-test diff --git a/sample/signal-test.c b/sample/signal-test.c index 63dd9547..98650ca1 100644 --- a/sample/signal-test.c +++ b/sample/signal-test.c @@ -5,6 +5,10 @@ #include +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #ifndef WIN32 #include diff --git a/sample/time-test.c b/sample/time-test.c index daa9daff..f0f93995 100644 --- a/sample/time-test.c +++ b/sample/time-test.c @@ -2,10 +2,13 @@ * Compile with: * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent */ -#include #include +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #ifndef WIN32 #include diff --git a/select.c b/select.c index 804eacc2..6ce81a23 100644 --- a/select.c +++ b/select.c @@ -27,7 +27,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifdef HAVE_CONFIG_H -#include "evconfig.h" +#include "config.h" #endif #include diff --git a/signal.c b/signal.c index c9b967ed..71bcffcb 100644 --- a/signal.c +++ b/signal.c @@ -27,7 +27,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifdef HAVE_CONFIG_H -#include "evconfig.h" +#include "config.h" #endif #include diff --git a/strlcpy-internal.h b/strlcpy-internal.h index 43f0ebb5..22b5f61d 100644 --- a/strlcpy-internal.h +++ b/strlcpy-internal.h @@ -6,7 +6,7 @@ extern "C" { #endif #ifdef HAVE_CONFIG_H -#include "evconfig.h" +#include "config.h" #endif /* HAVE_CONFIG_H */ #ifndef HAVE_STRLCPY diff --git a/strlcpy.c b/strlcpy.c index d21fec65..5d194527 100644 --- a/strlcpy.c +++ b/strlcpy.c @@ -34,7 +34,7 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp #include #ifdef HAVE_CONFIG_H -#include "evconfig.h" +#include "config.h" #endif /* HAVE_CONFIG_H */ #ifndef HAVE_STRLCPY diff --git a/test/bench.c b/test/bench.c index c97d1e64..61b05025 100644 --- a/test/bench.c +++ b/test/bench.c @@ -34,7 +34,7 @@ */ #ifdef HAVE_CONFIG_H -#include "evconfig.h" +#include "config.h" #endif #include diff --git a/test/regress.c b/test/regress.c index d5e0bc45..ff134dad 100644 --- a/test/regress.c +++ b/test/regress.c @@ -31,7 +31,7 @@ #endif #ifdef HAVE_CONFIG_H -#include "evconfig.h" +#include "config.h" #endif #include diff --git a/test/regress_dns.c b/test/regress_dns.c index c940f200..c65d3570 100644 --- a/test/regress_dns.c +++ b/test/regress_dns.c @@ -31,7 +31,7 @@ #endif #ifdef HAVE_CONFIG_H -#include "evconfig.h" +#include "config.h" #endif #include diff --git a/test/regress_http.c b/test/regress_http.c index ae0699b1..3fdaacb4 100644 --- a/test/regress_http.c +++ b/test/regress_http.c @@ -31,7 +31,7 @@ #endif #ifdef HAVE_CONFIG_H -#include "evconfig.h" +#include "config.h" #endif #include diff --git a/test/regress_rpc.c b/test/regress_rpc.c index 69031248..785127b9 100644 --- a/test/regress_rpc.c +++ b/test/regress_rpc.c @@ -31,7 +31,7 @@ #endif #ifdef HAVE_CONFIG_H -#include "evconfig.h" +#include "config.h" #endif #include