From ec347b92251e188a13cbbfe0fe2e00aa14aeeca5 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 7 Jul 2010 16:45:03 -0400 Subject: [PATCH] Move event-config.h to include/event2 This change means that all required include files are in event2, and all files not in event2/* are optional. --- .gitignore | 2 ++ Makefile.am | 20 ++++++++++---------- WIN32-Code/{ => event2}/event-config.h | 2 +- buffer.c | 4 ++-- buffer_iocp.c | 2 +- bufferevent-internal.h | 2 +- bufferevent.c | 2 +- bufferevent_async.c | 2 +- bufferevent_filter.c | 2 +- bufferevent_openssl.c | 2 +- bufferevent_pair.c | 2 +- bufferevent_sock.c | 2 +- configure.in | 1 + defer-internal.h | 2 +- devpoll.c | 2 +- epoll.c | 2 +- evbuffer-internal.h | 2 +- evdns.c | 2 +- event-internal.h | 2 +- event.c | 2 +- event.h | 2 +- event_rpcgen.py | 2 +- event_tagging.c | 2 +- evmap.c | 2 +- evport.c | 2 +- evrpc.c | 2 +- evthread-internal.h | 2 +- evthread.c | 2 +- evthread_pthread.c | 2 +- evthread_win32.c | 2 +- evutil.c | 2 +- evutil_rand.c | 2 +- http.c | 2 +- include/Makefile.am | 2 +- include/event2/buffer.h | 2 +- include/event2/bufferevent.h | 2 +- include/event2/bufferevent_ssl.h | 2 +- include/event2/bufferevent_struct.h | 2 +- include/event2/dns_compat.h | 2 +- include/event2/dns_struct.h | 2 +- include/event2/event.h | 2 +- include/event2/event_compat.h | 2 +- include/event2/event_struct.h | 2 +- include/event2/http_compat.h | 2 +- include/event2/http_struct.h | 2 +- include/event2/tag.h | 2 +- include/event2/thread.h | 2 +- include/event2/util.h | 2 +- ipv6-internal.h | 2 +- kqueue.c | 2 +- listener.c | 2 +- log.c | 2 +- minheap-internal.h | 2 +- poll.c | 2 +- sample/Makefile.am | 2 +- sample/dns-example.c | 2 +- sample/event-test.c | 2 +- sample/signal-test.c | 2 +- sample/time-test.c | 2 +- select.c | 2 +- signal.c | 2 +- strlcpy-internal.h | 2 +- strlcpy.c | 2 +- test/Makefile.am | 4 ++-- 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 | 4 ++-- test/regress_dns.c | 2 +- test/regress_et.c | 2 +- test/regress_http.c | 2 +- test/regress_main.c | 4 ++-- test/regress_pthread.c | 2 +- test/regress_rpc.c | 2 +- test/regress_testutils.c | 2 +- test/regress_util.c | 2 +- test/regress_zlib.c | 2 +- test/test-changelist.c | 2 +- test/test-eof.c | 2 +- test/test-init.c | 2 +- test/test-time.c | 2 +- test/test-weof.c | 2 +- util-internal.h | 2 +- win32select.c | 2 +- 86 files changed, 100 insertions(+), 97 deletions(-) rename WIN32-Code/{ => event2}/event-config.h (99%) diff --git a/.gitignore b/.gitignore index 197843f5..f3d7596a 100644 --- a/.gitignore +++ b/.gitignore @@ -66,6 +66,8 @@ libevent.pc /missing /stamp-h1 +/include/event2/event-config.h + /sample/dns-example /sample/event-test /sample/hello-world diff --git a/Makefile.am b/Makefile.am index 3fffb339..0cce0769 100644 --- a/Makefile.am +++ b/Makefile.am @@ -135,10 +135,11 @@ if SIGNAL_SUPPORT SYS_SRC += signal.c endif -BUILT_SOURCES = event-config.h +BUILT_SOURCES = ./include/event2/event-config.h -event-config.h: config.h - echo '/* event-config.h' > $@ +./include/event2/event-config.h: config.h + @MKDIR_P@ ./include/event2 + echo '/* event2/event-config.h' > $@ echo ' *' >> $@ echo ' * This file was generated by autoconf when libevent was built, and post-' >> $@ echo ' * processed by Libevent so that its macros would have a uniform prefix.' >> $@ @@ -147,8 +148,8 @@ event-config.h: config.h echo ' *' >> $@ echo ' * Do not rely on macros in this file existing in later versions.'>> $@ echo ' */' >> $@ - echo '#ifndef _EVENT_CONFIG_H_' >> $@ - echo '#define _EVENT_CONFIG_H_' >> $@ + echo '#ifndef _EVENT2_EVENT_CONFIG_H_' >> $@ + echo '#define _EVENT2_EVENT_CONFIG_H_' >> $@ sed -e 's/#define /#define _EVENT_/' \ -e 's/#undef /#undef _EVENT_/' \ @@ -201,15 +202,13 @@ noinst_HEADERS = util-internal.h mm-internal.h ipv6-internal.h \ minheap-internal.h log-internal.h evsignal-internal.h evmap-internal.h \ changelist-internal.h iocp-internal.h \ ratelim-internal.h \ - WIN32-Code/event-config.h \ + WIN32-Code/event2/event-config.h \ WIN32-Code/tree.h \ compat/sys/queue.h include_HEADERS = event.h evhttp.h evdns.h evrpc.h evutil.h -nodist_include_HEADERS = event-config.h - -INCLUDES = -I$(srcdir)/compat -I$(srcdir)/include $(SYS_INCLUDES) +INCLUDES = -I$(srcdir)/compat -I$(srcdir)/include -I./include $(SYS_INCLUDES) verify: check @@ -217,4 +216,5 @@ doxygen: FORCE doxygen $(srcdir)/Doxyfile FORCE: -DISTCLEANFILES = *~ event-config.h libevent.pc +DISTCLEANFILES = *~ libevent.pc ./include/event2/event-config.h + diff --git a/WIN32-Code/event-config.h b/WIN32-Code/event2/event-config.h similarity index 99% rename from WIN32-Code/event-config.h rename to WIN32-Code/event2/event-config.h index 78d22456..8e886d75 100644 --- a/WIN32-Code/event-config.h +++ b/WIN32-Code/event2/event-config.h @@ -1,4 +1,4 @@ -/* event-config.h +/* event2/event-config.h * * This file was generated by autoconf when libevent was built, and post- * processed by Libevent so that its macros would have a uniform prefix. diff --git a/buffer.c b/buffer.c index 2efd0125..b493c56a 100644 --- a/buffer.c +++ b/buffer.c @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "event-config.h" +#include "event2/event-config.h" #ifdef WIN32 #include @@ -82,7 +82,7 @@ #include "event2/bufferevent_compat.h" #include "event2/bufferevent_struct.h" #include "event2/thread.h" -#include "event-config.h" +#include "event2/event-config.h" #include "log-internal.h" #include "mm-internal.h" #include "util-internal.h" diff --git a/buffer_iocp.c b/buffer_iocp.c index ca0ec360..8255599c 100644 --- a/buffer_iocp.c +++ b/buffer_iocp.c @@ -35,7 +35,7 @@ #include "event2/buffer_compat.h" #include "event2/util.h" #include "event2/thread.h" -#include "event-config.h" +#include "event2/event-config.h" #include "util-internal.h" #include "evthread-internal.h" #include "evbuffer-internal.h" diff --git a/bufferevent-internal.h b/bufferevent-internal.h index 34914366..e0bb1c38 100644 --- a/bufferevent-internal.h +++ b/bufferevent-internal.h @@ -30,7 +30,7 @@ extern "C" { #endif -#include "event-config.h" +#include "event2/event-config.h" #include "evutil.h" #include "defer-internal.h" #include "evthread-internal.h" diff --git a/bufferevent.c b/bufferevent.c index 8d3f7cba..4e8d9278 100644 --- a/bufferevent.c +++ b/bufferevent.c @@ -27,7 +27,7 @@ #include -#include "event-config.h" +#include "event2/event-config.h" #ifdef _EVENT_HAVE_SYS_TIME_H #include diff --git a/bufferevent_async.c b/bufferevent_async.c index 30ec957a..23b636d2 100644 --- a/bufferevent_async.c +++ b/bufferevent_async.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "event-config.h" +#include "event2/event-config.h" #ifdef _EVENT_HAVE_SYS_TIME_H #include diff --git a/bufferevent_filter.c b/bufferevent_filter.c index 4fe64b54..c1fa3ddd 100644 --- a/bufferevent_filter.c +++ b/bufferevent_filter.c @@ -28,7 +28,7 @@ #include -#include "event-config.h" +#include "event2/event-config.h" #ifdef _EVENT_HAVE_SYS_TIME_H #include diff --git a/bufferevent_openssl.c b/bufferevent_openssl.c index ae805004..74d6ab4d 100644 --- a/bufferevent_openssl.c +++ b/bufferevent_openssl.c @@ -26,7 +26,7 @@ #include -#include "event-config.h" +#include "event2/event-config.h" #ifdef _EVENT_HAVE_SYS_TIME_H #include diff --git a/bufferevent_pair.c b/bufferevent_pair.c index 8083b149..1e20f78b 100644 --- a/bufferevent_pair.c +++ b/bufferevent_pair.c @@ -30,7 +30,7 @@ #include #endif -#include "event-config.h" +#include "event2/event-config.h" #include "event2/util.h" #include "event2/buffer.h" diff --git a/bufferevent_sock.c b/bufferevent_sock.c index 28d36421..70902524 100644 --- a/bufferevent_sock.c +++ b/bufferevent_sock.c @@ -28,7 +28,7 @@ #include -#include "event-config.h" +#include "event2/event-config.h" #ifdef _EVENT_HAVE_SYS_TIME_H #include diff --git a/configure.in b/configure.in index a1fc67b8..348cbcd6 100644 --- a/configure.in +++ b/configure.in @@ -18,6 +18,7 @@ dnl Checks for programs. AC_PROG_CC AC_PROG_INSTALL AC_PROG_LN_S +AC_PROG_MKDIR_P AC_PROG_GCC_TRADITIONAL diff --git a/defer-internal.h b/defer-internal.h index 59869fd4..6d21913c 100644 --- a/defer-internal.h +++ b/defer-internal.h @@ -30,7 +30,7 @@ extern "C" { #endif -#include "event-config.h" +#include "event2/event-config.h" #include struct deferred_cb; diff --git a/devpoll.c b/devpoll.c index 9d4d8ba1..3e1854ea 100644 --- a/devpoll.c +++ b/devpoll.c @@ -24,7 +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. */ -#include "event-config.h" +#include "event2/event-config.h" #include #include diff --git a/epoll.c b/epoll.c index 04fbfeb0..10c9138d 100644 --- a/epoll.c +++ b/epoll.c @@ -24,7 +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. */ -#include "event-config.h" +#include "event2/event-config.h" #include #include diff --git a/evbuffer-internal.h b/evbuffer-internal.h index 01f5703a..90fd1b55 100644 --- a/evbuffer-internal.h +++ b/evbuffer-internal.h @@ -31,7 +31,7 @@ extern "C" { #endif -#include "event-config.h" +#include "event2/event-config.h" #include "event2/util.h" #include "util-internal.h" #include "defer-internal.h" diff --git a/evdns.c b/evdns.c index 1f8c290f..fd72e622 100644 --- a/evdns.c +++ b/evdns.c @@ -35,7 +35,7 @@ */ #include -#include "event-config.h" +#include "event2/event-config.h" #ifndef _FORTIFY_SOURCE #define _FORTIFY_SOURCE 3 diff --git a/event-internal.h b/event-internal.h index 7388a597..6c463e85 100644 --- a/event-internal.h +++ b/event-internal.h @@ -31,7 +31,7 @@ extern "C" { #endif -#include "event-config.h" +#include "event2/event-config.h" #include #include "event2/event_struct.h" #include "minheap-internal.h" diff --git a/event.c b/event.c index 6d66f931..ce0f8b5c 100644 --- a/event.c +++ b/event.c @@ -24,7 +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. */ -#include "event-config.h" +#include "event2/event-config.h" #ifdef WIN32 #include diff --git a/event.h b/event.h index 4e391b6e..3f083c86 100644 --- a/event.h +++ b/event.h @@ -162,7 +162,7 @@ extern "C" { #endif -#include +#include #ifdef _EVENT_HAVE_SYS_TYPES_H #include #endif diff --git a/event_rpcgen.py b/event_rpcgen.py index 05f0a362..4ec20bd0 100755 --- a/event_rpcgen.py +++ b/event_rpcgen.py @@ -1574,7 +1574,7 @@ class CCodeGenerator: pre += ( '#include \n' '#include \n' '#include \n' - '#include \n' + '#include \n' '#include \n' '#include \n' '#include \n\n' diff --git a/event_tagging.c b/event_tagging.c index 04611ff0..9ee10113 100644 --- a/event_tagging.c +++ b/event_tagging.c @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "event-config.h" +#include "event2/event-config.h" #ifdef _EVENT_HAVE_SYS_TYPES_H #include diff --git a/evmap.c b/evmap.c index 9d21977d..505a426c 100644 --- a/evmap.c +++ b/evmap.c @@ -23,7 +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. */ -#include "event-config.h" +#include "event2/event-config.h" #ifdef WIN32 #include diff --git a/evport.c b/evport.c index 4c046bcd..e4e1e974 100644 --- a/evport.c +++ b/evport.c @@ -50,7 +50,7 @@ * As in the select(2) implementation, signals are handled by evsignal. */ -#include "event-config.h" +#include "event2/event-config.h" #include #include diff --git a/evrpc.c b/evrpc.c index 8765316d..3f223231 100644 --- a/evrpc.c +++ b/evrpc.c @@ -24,7 +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. */ -#include "event-config.h" +#include "event2/event-config.h" #ifdef WIN32 #define WIN32_LEAN_AND_MEAN diff --git a/evthread-internal.h b/evthread-internal.h index b2989b92..2be7c7ac 100644 --- a/evthread-internal.h +++ b/evthread-internal.h @@ -31,7 +31,7 @@ extern "C" { #endif #include -#include "event-config.h" +#include "event2/event-config.h" #include "util-internal.h" struct event_base; diff --git a/evthread.c b/evthread.c index 1f0c1614..e2a95b9d 100644 --- a/evthread.c +++ b/evthread.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "event-config.h" +#include "event2/event-config.h" #ifndef _EVENT_DISABLE_THREAD_SUPPORT diff --git a/evthread_pthread.c b/evthread_pthread.c index 4d035a41..c5f4c537 100644 --- a/evthread_pthread.c +++ b/evthread_pthread.c @@ -23,7 +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. */ -#include "event-config.h" +#include "event2/event-config.h" /* 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 eccade41..7b226a0c 100644 --- a/evthread_win32.c +++ b/evthread_win32.c @@ -23,7 +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. */ -#include "event-config.h" +#include "event2/event-config.h" #ifdef WIN32 #include diff --git a/evutil.c b/evutil.c index 3b04316c..16ac3449 100644 --- a/evutil.c +++ b/evutil.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "event-config.h" +#include "event2/event-config.h" #define _GNU_SOURCE diff --git a/evutil_rand.c b/evutil_rand.c index a841f026..4e3485c2 100644 --- a/evutil_rand.c +++ b/evutil_rand.c @@ -32,7 +32,7 @@ * so that other people can rip it out and use it for whatever. */ -#include "event-config.h" +#include "event2/event-config.h" #include "util-internal.h" #include "evthread-internal.h" diff --git a/http.c b/http.c index 19d4f91d..df6b1036 100644 --- a/http.c +++ b/http.c @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "event-config.h" +#include "event2/event-config.h" #ifdef _EVENT_HAVE_SYS_PARAM_H #include diff --git a/include/Makefile.am b/include/Makefile.am index 9b21abc5..9fc47257 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -27,5 +27,5 @@ EVENT2_EXPORT = \ EXTRA_SRC = $(EVENT2_EXPORT) -nobase_include_HEADERS = $(EVENT2_EXPORT) +nobase_include_HEADERS = $(EVENT2_EXPORT) ./event2/event-config.h diff --git a/include/event2/buffer.h b/include/event2/buffer.h index bd175c25..b5feefae 100644 --- a/include/event2/buffer.h +++ b/include/event2/buffer.h @@ -65,7 +65,7 @@ extern "C" { #endif -#include +#include #include #ifdef _EVENT_HAVE_SYS_TYPES_H #include diff --git a/include/event2/bufferevent.h b/include/event2/bufferevent.h index b87f3a29..570a6a61 100644 --- a/include/event2/bufferevent.h +++ b/include/event2/bufferevent.h @@ -54,7 +54,7 @@ extern "C" { #endif -#include +#include #ifdef _EVENT_HAVE_SYS_TYPES_H #include #endif diff --git a/include/event2/bufferevent_ssl.h b/include/event2/bufferevent_ssl.h index 99281a37..03629331 100644 --- a/include/event2/bufferevent_ssl.h +++ b/include/event2/bufferevent_ssl.h @@ -31,7 +31,7 @@ OpenSSL support for bufferevents. */ -#include +#include #include #include diff --git a/include/event2/bufferevent_struct.h b/include/event2/bufferevent_struct.h index 8ef3e8e6..5626e968 100644 --- a/include/event2/bufferevent_struct.h +++ b/include/event2/bufferevent_struct.h @@ -38,7 +38,7 @@ extern "C" { #endif -#include +#include #ifdef _EVENT_HAVE_SYS_TYPES_H #include #endif diff --git a/include/event2/dns_compat.h b/include/event2/dns_compat.h index cd7946cf..77ce838f 100644 --- a/include/event2/dns_compat.h +++ b/include/event2/dns_compat.h @@ -38,7 +38,7 @@ extern "C" { #endif -#include +#include #ifdef _EVENT_HAVE_SYS_TYPES_H #include #endif diff --git a/include/event2/dns_struct.h b/include/event2/dns_struct.h index ce50d6d1..c501eb20 100644 --- a/include/event2/dns_struct.h +++ b/include/event2/dns_struct.h @@ -38,7 +38,7 @@ extern "C" { #endif -#include +#include #ifdef _EVENT_HAVE_SYS_TYPES_H #include #endif diff --git a/include/event2/event.h b/include/event2/event.h index acee64a7..e9d0048f 100644 --- a/include/event2/event.h +++ b/include/event2/event.h @@ -37,7 +37,7 @@ extern "C" { #endif -#include +#include #ifdef _EVENT_HAVE_SYS_TYPES_H #include #endif diff --git a/include/event2/event_compat.h b/include/event2/event_compat.h index f59850a0..78f6469b 100644 --- a/include/event2/event_compat.h +++ b/include/event2/event_compat.h @@ -38,7 +38,7 @@ extern "C" { #endif -#include +#include #ifdef _EVENT_HAVE_SYS_TYPES_H #include #endif diff --git a/include/event2/event_struct.h b/include/event2/event_struct.h index 83ac2232..7910e637 100644 --- a/include/event2/event_struct.h +++ b/include/event2/event_struct.h @@ -38,7 +38,7 @@ extern "C" { #endif -#include +#include #ifdef _EVENT_HAVE_SYS_TYPES_H #include #endif diff --git a/include/event2/http_compat.h b/include/event2/http_compat.h index a8f29ff9..b23dd9e0 100644 --- a/include/event2/http_compat.h +++ b/include/event2/http_compat.h @@ -38,7 +38,7 @@ extern "C" { #endif -#include +#include #ifdef _EVENT_HAVE_SYS_TYPES_H #include #endif diff --git a/include/event2/http_struct.h b/include/event2/http_struct.h index de5d5417..a3664e04 100644 --- a/include/event2/http_struct.h +++ b/include/event2/http_struct.h @@ -38,7 +38,7 @@ extern "C" { #endif -#include +#include #ifdef _EVENT_HAVE_SYS_TYPES_H #include #endif diff --git a/include/event2/tag.h b/include/event2/tag.h index ea8fa952..7ab2346b 100644 --- a/include/event2/tag.h +++ b/include/event2/tag.h @@ -37,7 +37,7 @@ extern "C" { #endif -#include +#include #ifdef _EVENT_HAVE_SYS_TYPES_H #include #endif diff --git a/include/event2/thread.h b/include/event2/thread.h index 26897eb1..1a517d81 100644 --- a/include/event2/thread.h +++ b/include/event2/thread.h @@ -57,7 +57,7 @@ extern "C" { #endif -#include +#include /** A flag passed to a locking callback when the lock was allocated as a * read-write lock, and we want to acquire or release the lock for writing. */ diff --git a/include/event2/util.h b/include/event2/util.h index 13db8a63..7e21410d 100644 --- a/include/event2/util.h +++ b/include/event2/util.h @@ -37,7 +37,7 @@ extern "C" { #endif -#include +#include #ifdef _EVENT_HAVE_SYS_TIME_H #include #endif diff --git a/ipv6-internal.h b/ipv6-internal.h index 0a41c549..b1c8cd32 100644 --- a/ipv6-internal.h +++ b/ipv6-internal.h @@ -34,7 +34,7 @@ #ifdef _EVENT_HAVE_SYS_SOCKET_H #include #endif -#include "event-config.h" +#include "event2/event-config.h" #include #ifdef __cplusplus diff --git a/kqueue.c b/kqueue.c index b8ffade5..d5fa4e40 100644 --- a/kqueue.c +++ b/kqueue.c @@ -26,7 +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. */ -#include "event-config.h" +#include "event2/event-config.h" #define _GNU_SOURCE diff --git a/listener.c b/listener.c index c0530821..edfdaefc 100644 --- a/listener.c +++ b/listener.c @@ -26,7 +26,7 @@ #include -#include "event-config.h" +#include "event2/event-config.h" #ifdef WIN32 #include diff --git a/log.c b/log.c index 06f9efd0..f0cd4320 100644 --- a/log.c +++ b/log.c @@ -37,7 +37,7 @@ * SUCH DAMAGE. */ -#include "event-config.h" +#include "event2/event-config.h" #ifdef WIN32 #include diff --git a/minheap-internal.h b/minheap-internal.h index 4739daf4..0557c2ba 100644 --- a/minheap-internal.h +++ b/minheap-internal.h @@ -28,7 +28,7 @@ #ifndef _MIN_HEAP_H_ #define _MIN_HEAP_H_ -#include "event-config.h" +#include "event2/event-config.h" #include "event2/event.h" #include "event2/event_struct.h" #include "event2/util.h" diff --git a/poll.c b/poll.c index abbf90eb..36f11608 100644 --- a/poll.c +++ b/poll.c @@ -26,7 +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. */ -#include "event-config.h" +#include "event2/event-config.h" #include #ifdef _EVENT_HAVE_SYS_TIME_H diff --git a/sample/Makefile.am b/sample/Makefile.am index 9a376e8c..b309fa48 100644 --- a/sample/Makefile.am +++ b/sample/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies LDADD = ../libevent.la -AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include -I../include noinst_PROGRAMS = event-test time-test signal-test dns-example hello-world diff --git a/sample/dns-example.c b/sample/dns-example.c index 507cd5c8..55318215 100644 --- a/sample/dns-example.c +++ b/sample/dns-example.c @@ -5,7 +5,7 @@ XXX It's pretty ugly and should probably be cleaned up. */ -#include +#include #include diff --git a/sample/event-test.c b/sample/event-test.c index 0f3f7665..e4d7a423 100644 --- a/sample/event-test.c +++ b/sample/event-test.c @@ -8,7 +8,7 @@ * cc -I/usr/local/include -o event-test event-test.c -L/usr/local/lib -levent */ -#include +#include #include #include diff --git a/sample/signal-test.c b/sample/signal-test.c index 58524ccd..53c025f9 100644 --- a/sample/signal-test.c +++ b/sample/signal-test.c @@ -6,7 +6,7 @@ #include -#include +#include #include #ifndef WIN32 diff --git a/sample/time-test.c b/sample/time-test.c index 619bec38..61b4a6c1 100644 --- a/sample/time-test.c +++ b/sample/time-test.c @@ -10,7 +10,7 @@ #include -#include +#include #include #ifndef WIN32 diff --git a/select.c b/select.c index 0b927857..9fafce31 100644 --- a/select.c +++ b/select.c @@ -26,7 +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. */ -#include "event-config.h" +#include "event2/event-config.h" #include #ifdef _EVENT_HAVE_SYS_TIME_H diff --git a/signal.c b/signal.c index 386f4763..3c474d33 100644 --- a/signal.c +++ b/signal.c @@ -26,7 +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. */ -#include "event-config.h" +#include "event2/event-config.h" #ifdef WIN32 #define WIN32_LEAN_AND_MEAN diff --git a/strlcpy-internal.h b/strlcpy-internal.h index 358daae7..1968c003 100644 --- a/strlcpy-internal.h +++ b/strlcpy-internal.h @@ -5,7 +5,7 @@ extern "C" { #endif -#include "event-config.h" +#include "event2/event-config.h" #ifndef _EVENT_HAVE_STRLCPY #include diff --git a/strlcpy.c b/strlcpy.c index 97f81b90..11053c33 100644 --- a/strlcpy.c +++ b/strlcpy.c @@ -33,7 +33,7 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp #include -#include "event-config.h" +#include "event2/event-config.h" #ifndef _EVENT_HAVE_STRLCPY #include "strlcpy-internal.h" diff --git a/test/Makefile.am b/test/Makefile.am index c95aa49f..6c133037 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign -AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include +AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include -I../include EXTRA_DIST = regress.rpc regress.gen.h regress.gen.c test.sh @@ -44,7 +44,7 @@ endif regress_LDADD = ../libevent.la $(PTHREAD_LIBS) $(ZLIB_LIBS) regress_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat \ - -I$(top_srcdir)/include $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS) + -I$(top_srcdir)/include -I../include $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS) regress_LDFLAGS = $(PTHREAD_CFLAGS) if OPENSSL diff --git a/test/bench.c b/test/bench.c index d1629daa..76717d77 100644 --- a/test/bench.c +++ b/test/bench.c @@ -33,7 +33,7 @@ * */ -#include "event-config.h" +#include "event2/event-config.h" #include #include diff --git a/test/bench_cascade.c b/test/bench_cascade.c index bf0f032d..6b508ef1 100644 --- a/test/bench_cascade.c +++ b/test/bench_cascade.c @@ -25,7 +25,7 @@ * */ -#include "event-config.h" +#include "event2/event-config.h" #include #include diff --git a/test/bench_http.c b/test/bench_http.c index 44a50597..fdcf49dd 100644 --- a/test/bench_http.c +++ b/test/bench_http.c @@ -25,7 +25,7 @@ * */ -#include "event-config.h" +#include "event2/event-config.h" #include #include diff --git a/test/regress.c b/test/regress.c index 82c7c3b6..8ce68e77 100644 --- a/test/regress.c +++ b/test/regress.c @@ -30,7 +30,7 @@ #include #endif -#include "event-config.h" +#include "event2/event-config.h" #include #include diff --git a/test/regress_buffer.c b/test/regress_buffer.c index ea97d126..65802a25 100644 --- a/test/regress_buffer.c +++ b/test/regress_buffer.c @@ -30,7 +30,7 @@ #include #endif -#include "event-config.h" +#include "event2/event-config.h" #include #include diff --git a/test/regress_bufferevent.c b/test/regress_bufferevent.c index df769f5a..b2271084 100644 --- a/test/regress_bufferevent.c +++ b/test/regress_bufferevent.c @@ -30,7 +30,7 @@ #include #endif -#include "event-config.h" +#include "event2/event-config.h" #include #include @@ -58,7 +58,7 @@ #include #endif -#include "event-config.h" +#include "event2/event-config.h" #include "event2/event.h" #include "event2/event_struct.h" #include "event2/event_compat.h" diff --git a/test/regress_dns.c b/test/regress_dns.c index deee766e..a2d9b10d 100644 --- a/test/regress_dns.c +++ b/test/regress_dns.c @@ -31,7 +31,7 @@ #include #endif -#include "event-config.h" +#include "event2/event-config.h" #include #include diff --git a/test/regress_et.c b/test/regress_et.c index 87ecc5ba..0cba7564 100644 --- a/test/regress_et.c +++ b/test/regress_et.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #ifdef WIN32 #include diff --git a/test/regress_http.c b/test/regress_http.c index 99fb4a2c..3625f860 100644 --- a/test/regress_http.c +++ b/test/regress_http.c @@ -30,7 +30,7 @@ #include #endif -#include "event-config.h" +#include "event2/event-config.h" #include #include diff --git a/test/regress_main.c b/test/regress_main.c index 822ea80b..29d82475 100644 --- a/test/regress_main.c +++ b/test/regress_main.c @@ -32,7 +32,7 @@ #include #endif -#include "event-config.h" +#include "event2/event-config.h" #ifdef _EVENT___func__ #define __func__ _EVENT___func__ @@ -71,7 +71,7 @@ #include #include -#include "event-config.h" +#include "event2/event-config.h" #include "regress.h" #include "tinytest.h" #include "tinytest_macros.h" diff --git a/test/regress_pthread.c b/test/regress_pthread.c index 27e59012..39dd99b9 100644 --- a/test/regress_pthread.c +++ b/test/regress_pthread.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "event-config.h" +#include "event2/event-config.h" #include #include diff --git a/test/regress_rpc.c b/test/regress_rpc.c index 482f9a77..79e094bb 100644 --- a/test/regress_rpc.c +++ b/test/regress_rpc.c @@ -30,7 +30,7 @@ #include #endif -#include "event-config.h" +#include "event2/event-config.h" #include #include diff --git a/test/regress_testutils.c b/test/regress_testutils.c index bb174833..f2eeb8b5 100644 --- a/test/regress_testutils.c +++ b/test/regress_testutils.c @@ -30,7 +30,7 @@ #include #endif -#include "event-config.h" +#include "event2/event-config.h" #include #include diff --git a/test/regress_util.c b/test/regress_util.c index 47b5cbfd..16277a12 100644 --- a/test/regress_util.c +++ b/test/regress_util.c @@ -29,7 +29,7 @@ #include #endif -#include "event-config.h" +#include "event2/event-config.h" #include diff --git a/test/regress_zlib.c b/test/regress_zlib.c index 5ef78ea9..5e7a37c1 100644 --- a/test/regress_zlib.c +++ b/test/regress_zlib.c @@ -29,7 +29,7 @@ #include #endif -#include "event-config.h" +#include "event2/event-config.h" #include #ifndef WIN32 diff --git a/test/test-changelist.c b/test/test-changelist.c index 59a312be..7a328f20 100644 --- a/test/test-changelist.c +++ b/test/test-changelist.c @@ -2,7 +2,7 @@ * based on test-eof.c */ -#include "event-config.h" +#include "event2/event-config.h" #ifdef WIN32 #include diff --git a/test/test-eof.c b/test/test-eof.c index 001370a8..fd226193 100644 --- a/test/test-eof.c +++ b/test/test-eof.c @@ -2,7 +2,7 @@ * Compile with: * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent */ -#include "event-config.h" +#include "event2/event-config.h" #ifdef WIN32 #include diff --git a/test/test-init.c b/test/test-init.c index 3806c15d..967a0131 100644 --- a/test/test-init.c +++ b/test/test-init.c @@ -2,7 +2,7 @@ * Compile with: * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent */ -#include "event-config.h" +#include "event2/event-config.h" #include #include diff --git a/test/test-time.c b/test/test-time.c index 24daf8c8..acb4421a 100644 --- a/test/test-time.c +++ b/test/test-time.c @@ -2,7 +2,7 @@ * Compile with: * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent */ -#include "event-config.h" +#include "event2/event-config.h" #include #include diff --git a/test/test-weof.c b/test/test-weof.c index 946d3a0b..8d1b0ab8 100644 --- a/test/test-weof.c +++ b/test/test-weof.c @@ -2,7 +2,7 @@ * Compile with: * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent */ -#include "event-config.h" +#include "event2/event-config.h" #ifdef WIN32 #include diff --git a/util-internal.h b/util-internal.h index 459a2476..7d276164 100644 --- a/util-internal.h +++ b/util-internal.h @@ -26,7 +26,7 @@ #ifndef _EVENT_UTIL_INTERNAL_H #define _EVENT_UTIL_INTERNAL_H -#include "event-config.h" +#include "event2/event-config.h" #include /* For EVUTIL_ASSERT */ diff --git a/win32select.c b/win32select.c index a3b8dd7d..103acb5a 100644 --- a/win32select.c +++ b/win32select.c @@ -38,7 +38,7 @@ #include #include "event2/util.h" -#include "event-config.h" +#include "event2/event-config.h" #include "util-internal.h" #include "log-internal.h" #include "event2/event.h" -- 2.40.0