Move event-config.h to include/event2
authorNick Mathewson <nickm@torproject.org>
Wed, 7 Jul 2010 20:45:03 +0000 (16:45 -0400)
committerNick Mathewson <nickm@torproject.org>
Sat, 7 Aug 2010 00:21:27 +0000 (20:21 -0400)
This change means that all required include files are in event2, and
all files not in event2/* are optional.

86 files changed:
.gitignore
Makefile.am
WIN32-Code/event2/event-config.h [moved from WIN32-Code/event-config.h with 99% similarity]
buffer.c
buffer_iocp.c
bufferevent-internal.h
bufferevent.c
bufferevent_async.c
bufferevent_filter.c
bufferevent_openssl.c
bufferevent_pair.c
bufferevent_sock.c
configure.in
defer-internal.h
devpoll.c
epoll.c
evbuffer-internal.h
evdns.c
event-internal.h
event.c
event.h
event_rpcgen.py
event_tagging.c
evmap.c
evport.c
evrpc.c
evthread-internal.h
evthread.c
evthread_pthread.c
evthread_win32.c
evutil.c
evutil_rand.c
http.c
include/Makefile.am
include/event2/buffer.h
include/event2/bufferevent.h
include/event2/bufferevent_ssl.h
include/event2/bufferevent_struct.h
include/event2/dns_compat.h
include/event2/dns_struct.h
include/event2/event.h
include/event2/event_compat.h
include/event2/event_struct.h
include/event2/http_compat.h
include/event2/http_struct.h
include/event2/tag.h
include/event2/thread.h
include/event2/util.h
ipv6-internal.h
kqueue.c
listener.c
log.c
minheap-internal.h
poll.c
sample/Makefile.am
sample/dns-example.c
sample/event-test.c
sample/signal-test.c
sample/time-test.c
select.c
signal.c
strlcpy-internal.h
strlcpy.c
test/Makefile.am
test/bench.c
test/bench_cascade.c
test/bench_http.c
test/regress.c
test/regress_buffer.c
test/regress_bufferevent.c
test/regress_dns.c
test/regress_et.c
test/regress_http.c
test/regress_main.c
test/regress_pthread.c
test/regress_rpc.c
test/regress_testutils.c
test/regress_util.c
test/regress_zlib.c
test/test-changelist.c
test/test-eof.c
test/test-init.c
test/test-time.c
test/test-weof.c
util-internal.h
win32select.c

index 197843f5f7066bd20c8dee6971d8ce6c69cd608c..f3d7596a5a109553b2a57eb0f30663d90d4f049d 100644 (file)
@@ -66,6 +66,8 @@ libevent.pc
 /missing
 /stamp-h1
 
+/include/event2/event-config.h
+
 /sample/dns-example
 /sample/event-test
 /sample/hello-world
index 3fffb339b568a3262aa1a185297526b6197fee8e..0cce076997b03cfedadea91d0fa1344203f9925e 100644 (file)
@@ -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
+
similarity index 99%
rename from WIN32-Code/event-config.h
rename to WIN32-Code/event2/event-config.h
index 78d22456253f9729d050d65887fa07bf6909e864..8e886d75b1d1e90ee5ae249b7dae4a1ca2a21106 100644 (file)
@@ -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.
index 2efd0125776c3e506258092c03b9a2dc1278a6b3..b493c56a7cb7209f3c8ce065b0bcaa71c3363454 100644 (file)
--- 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 <winsock2.h>
@@ -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"
index ca0ec3606636bb07ebd283adee30d3a1ac6fdb57..8255599c22b3a65949e9f7c2285824d337bca957 100644 (file)
@@ -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"
index 349143662b514bc5952a5b8f0a66fbbb2de6d2ff..e0bb1c38e76d63859334ab83edfe27e236d4f664 100644 (file)
@@ -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"
index 8d3f7cbae94ac5fb9591e45185c7afb4101d87b1..4e8d92780e495121af41bcdf0acc5944fc06aa77 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <sys/types.h>
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifdef _EVENT_HAVE_SYS_TIME_H
 #include <sys/time.h>
index 30ec957a3cb26815c18cda9ea81b0d83836dc57f..23b636d20f147c014592b0b1d20732189f87f084 100644 (file)
@@ -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 <sys/time.h>
index 4fe64b5414f6ca176656914f506eedf8c29e2a0b..c1fa3ddd5a4a1f7f3b9c4ebb628b7d78c5d0c7ef 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <sys/types.h>
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifdef _EVENT_HAVE_SYS_TIME_H
 #include <sys/time.h>
index ae805004c5b788d86edaa3a956a6291e49fa4702..74d6ab4d7ae8f5b2caec32d5251119ce853915f5 100644 (file)
@@ -26,7 +26,7 @@
 
 #include <sys/types.h>
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifdef _EVENT_HAVE_SYS_TIME_H
 #include <sys/time.h>
index 8083b14941f17ddb927ea18f92a230593c3e8a01..1e20f78b94abe0f3f375f7d608e0528427a8bf48 100644 (file)
@@ -30,7 +30,7 @@
 #include <winsock2.h>
 #endif
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #include "event2/util.h"
 #include "event2/buffer.h"
index 28d36421677991dd1d30954cd08fff03249ffeae..7090252446700121ed9ad0f7ab14e86e23e9c254 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <sys/types.h>
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifdef _EVENT_HAVE_SYS_TIME_H
 #include <sys/time.h>
index a1fc67b8e95f4ba7d6950aaab5c1c833c007d61b..348cbcd675dd142f558274e7a1ddc658c22c6666 100644 (file)
@@ -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
 
index 59869fd4bf43d10b820ede658bc2609553f3bd31..6d21913ced4b8637ff924a3727333b597d635352 100644 (file)
@@ -30,7 +30,7 @@
 extern "C" {
 #endif
 
-#include "event-config.h"
+#include "event2/event-config.h"
 #include <sys/queue.h>
 
 struct deferred_cb;
index 9d4d8ba16a678af39a9a1f8ce0164817b4ff7868..3e1854ea0a3923b4073d68097fceaa7f7617b370 100644 (file)
--- 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 <sys/types.h>
 #include <sys/resource.h>
diff --git a/epoll.c b/epoll.c
index 04fbfeb06485bc30d0320629c05aa045e7e0da49..10c9138dc826888f4a8e793d4e8c82e6a04e2f14 100644 (file)
--- 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 <stdint.h>
 #include <sys/types.h>
index 01f5703aeb3dc67e2111cd4c0dd400d48c9e19b2..90fd1b55f9be0185a3f5b7792b11d9b6f1b996fb 100644 (file)
@@ -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 1f8c290f6cb719aaa3b4aceddaf2f728e28aa1cb..fd72e6220aed9b1e2cfda163c34550da8aa95ec8 100644 (file)
--- a/evdns.c
+++ b/evdns.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/types.h>
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifndef _FORTIFY_SOURCE
 #define _FORTIFY_SOURCE 3
index 7388a5975b07312e5f92be1d877274462a5c8c32..6c463e8515d1a3e6cbb7d511538a6d47187ba6e8 100644 (file)
@@ -31,7 +31,7 @@
 extern "C" {
 #endif
 
-#include "event-config.h"
+#include "event2/event-config.h"
 #include <sys/queue.h>
 #include "event2/event_struct.h"
 #include "minheap-internal.h"
diff --git a/event.c b/event.c
index 6d66f9315cb9cfe97126dd7fee9128a054c78212..ce0f8b5ce032d19497e7254c5ee22847374261da 100644 (file)
--- 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 <winsock2.h>
diff --git a/event.h b/event.h
index 4e391b6e43d8a560c3517f40061b1c157ce5751e..3f083c860f30e214dd17941accedc027dbba8c94 100644 (file)
--- a/event.h
+++ b/event.h
 extern "C" {
 #endif
 
-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
index 05f0a3622aa7d9343d8f3e86f6c42fc0465e46ae..4ec20bd001daf24fe120caa5c97eec8f73652c2e 100755 (executable)
@@ -1574,7 +1574,7 @@ class CCodeGenerator:
         pre += ( '#include <stdlib.h>\n'
                  '#include <string.h>\n'
                  '#include <assert.h>\n'
-                 '#include <event-config.h>\n'
+                 '#include <event2/event-config.h>\n'
                  '#include <event2/event.h>\n'
                  '#include <event2/buffer.h>\n'
                  '#include <event2/tag.h>\n\n'
index 04611ff0dd5cf82c52a8554496599cf391d332ff..9ee1011367b8dfbabf96f2064f6c71fa7ca33b22 100644 (file)
@@ -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 <sys/types.h>
diff --git a/evmap.c b/evmap.c
index 9d21977df883c6b0bf28a1637ada635919d66805..505a426c8e0121155567c1d07c9ab26aec211b8b 100644 (file)
--- 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 <winsock2.h>
index 4c046bcdf677f088a961540b47159c424a3c2045..e4e1e9742679216163492955583a1b3c71d79d65 100644 (file)
--- 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 <sys/time.h>
 #include <sys/queue.h>
diff --git a/evrpc.c b/evrpc.c
index 8765316d4fdf06a24fb15c529f67a134718648f8..3f223231da7c5b697d65de399de1eda0e8c6c186 100644 (file)
--- 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
index b2989b9270be19c933ebd4e9f303a66301919fb7..2be7c7ac996aeb5b683c06e1c06d3258352d7ffb 100644 (file)
@@ -31,7 +31,7 @@ extern "C" {
 #endif
 
 #include <event2/thread.h>
-#include "event-config.h"
+#include "event2/event-config.h"
 #include "util-internal.h"
 
 struct event_base;
index 1f0c161417522aa77d716939503c5e47ee96fd29..e2a95b9d29bb6192e5524d63f972bea9fb23acdc 100644 (file)
@@ -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
 
index 4d035a41f97091120aa9dd53986efc14f9d5a959..c5f4c5378c0c3123e62226d4d0dfb26d459d59a1 100644 (file)
@@ -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
index eccade41c7548de498090fb6e1a0861f76a5bf38..7b226a0c8ce0d8941bfd5042adacab940817b43a 100644 (file)
@@ -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 <winsock2.h>
index 3b04316cf7581eb918777c1a98ed43038ef7c058..16ac34495aa22f92e4f007b7e1fde07e69b21916 100644 (file)
--- 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
 
index a841f026535af7d24dd647439f583a703678f80f..4e3485c2323215e58ec572e1bfc8c5b1847a5548 100644 (file)
@@ -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 19d4f91df0848d9f2f5a5239b15e359e5cf1bdc9..df6b103657f6bb22adf325a5e9e850179d6ba1f8 100644 (file)
--- 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 <sys/param.h>
index 9b21abc537a283893a5cf2e5017191c76ad126bd..9fc4725714d22314f6243cb12795430badf24fde 100644 (file)
@@ -27,5 +27,5 @@ EVENT2_EXPORT = \
 
 EXTRA_SRC = $(EVENT2_EXPORT)
 
-nobase_include_HEADERS = $(EVENT2_EXPORT)
+nobase_include_HEADERS = $(EVENT2_EXPORT) ./event2/event-config.h
 
index bd175c258afb431f5ca1182c7b559f9eadcfcb2a..b5feefaec16fee7ea823e94430be4331df314292 100644 (file)
@@ -65,7 +65,7 @@
 extern "C" {
 #endif
 
-#include <event-config.h>
+#include <event2/event-config.h>
 #include <stdarg.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
index b87f3a293877d33c053b2cb45f078559e56cc372..570a6a61b6571fe6371af2d71ac0a0ba53cffeca 100644 (file)
@@ -54,7 +54,7 @@
 extern "C" {
 #endif
 
-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
index 99281a3758c3353aeff6b9d1f40fffb1d44a2b04..036293317cc145d40174dd12dabde1c55f26b51f 100644 (file)
@@ -31,7 +31,7 @@
     OpenSSL support for bufferevents.
  */
 
-#include <event-config.h>
+#include <event2/event-config.h>
 #include <event2/bufferevent.h>
 #include <event2/util.h>
 
index 8ef3e8e6b8c2961f1f4359e1739d1294d3af21e1..5626e968f59c785b01bcbc540aad6edc6e764456 100644 (file)
@@ -38,7 +38,7 @@
 extern "C" {
 #endif
 
-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
index cd7946cf7a541d8ea71b18b5a2ff0d268257fa43..77ce838f6349af9cd9774a68428d458e7357d674 100644 (file)
@@ -38,7 +38,7 @@
 extern "C" {
 #endif
 
-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
index ce50d6d1ab890f01c0072bf7d9793c0a96ebc6e7..c501eb20b7f93d7f698add8c92d280c753fdaecd 100644 (file)
@@ -38,7 +38,7 @@
 extern "C" {
 #endif
 
-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
index acee64a7a4ba44c5f9f17c8b1ad374c3bef3ec4f..e9d0048fbeff31b85225651de7f000418352bf3e 100644 (file)
@@ -37,7 +37,7 @@
 extern "C" {
 #endif
 
-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
index f59850a0143821105e64e7f9efc0262457c8b601..78f6469b0657c1e119985a95d355a545f10e017d 100644 (file)
@@ -38,7 +38,7 @@
 extern "C" {
 #endif
 
-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
index 83ac2232ace9b655dad2a5082e90a8f1af7d15aa..7910e6375f4889a41587647ff39a064d8437ac0b 100644 (file)
@@ -38,7 +38,7 @@
 extern "C" {
 #endif
 
-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
index a8f29ff9bdf303375e3e15284aef61b60dc83588..b23dd9e052e8b7debdaeb8922dd0c14668c95c37 100644 (file)
@@ -38,7 +38,7 @@
 extern "C" {
 #endif
 
-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
index de5d5417e279e8b6f86fddc00a15184ad2f1566e..a3664e0448b762e886629a4e22e0d0440de40c62 100644 (file)
@@ -38,7 +38,7 @@
 extern "C" {
 #endif
 
-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
index ea8fa9527a4169418240b1939b17639ecd04df2d..7ab2346be6d3b459382f6be9939595e6a1f91a4c 100644 (file)
@@ -37,7 +37,7 @@
 extern "C" {
 #endif
 
-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
index 26897eb1a4d6a520354e52a8740e2ae67d965f38..1a517d81624849070752eab6b511ec416750a6b7 100644 (file)
@@ -57,7 +57,7 @@
 extern "C" {
 #endif
 
-#include <event-config.h>
+#include <event2/event-config.h>
 
 /** 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. */
index 13db8a6371acead0f9b5654ad651ea95f0661c3a..7e21410d7d201568789ad9851216e4ff16b7665d 100644 (file)
@@ -37,7 +37,7 @@
 extern "C" {
 #endif
 
-#include <event-config.h>
+#include <event2/event-config.h>
 #ifdef _EVENT_HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
index 0a41c54928e43d5357b33e9e6df2e03bd0228b10..b1c8cd3224acd81f546190faa190ccf99cc9a791 100644 (file)
@@ -34,7 +34,7 @@
 #ifdef _EVENT_HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
-#include "event-config.h"
+#include "event2/event-config.h"
 #include <event2/util.h>
 
 #ifdef __cplusplus
index b8ffade5cebb89f9e391c3e4bbec98b7eb5e56dc..d5fa4e40f84d3534c86f71b52e529ea3047793bb 100644 (file)
--- 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
 
index c053082127c25d3ee7bb06ea4b8a6f56d3ef974f..edfdaefca4c6bac353b5a0aa2a9260dac10d5dec 100644 (file)
@@ -26,7 +26,7 @@
 
 #include <sys/types.h>
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifdef WIN32
 #include <winsock2.h>
diff --git a/log.c b/log.c
index 06f9efd000bd14d13733f3802e1cc13bb08b1761..f0cd4320d139dd913d3e549029f0d26c6113762b 100644 (file)
--- a/log.c
+++ b/log.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  */
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifdef WIN32
 #include <winsock2.h>
index 4739daf4017cc2aa3f1c9227a2361fe23874ef93..0557c2bab6f36ff80797b61937e0adc37db4d695 100644 (file)
@@ -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 abbf90eb2f9d7d1c4ec49a84ac0c24f613910a99..36f11608123e79727963d528398115f33948f442 100644 (file)
--- 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 <sys/types.h>
 #ifdef _EVENT_HAVE_SYS_TIME_H
index 9a376e8cd92fef49bf457dad40340267468bba33..b309fa486a2efc5d9c1ef310ceeee76a9e33b8d8 100644 (file)
@@ -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
 
index 507cd5c89cbbc2dc69a6722bd80fdf5b6c974321..5531821576a746a9d56e5c0cdf2fd16c2f4a2ec1 100644 (file)
@@ -5,7 +5,7 @@
   XXX It's pretty ugly and should probably be cleaned up.
  */
 
-#include <event-config.h>
+#include <event2/event-config.h>
 
 #include <sys/types.h>
 
index 0f3f766502e0e465995aace62b4c60c2ddd810ac..e4d7a4238d61aa01aaa3435515b95019cffcf908 100644 (file)
@@ -8,7 +8,7 @@
  * cc -I/usr/local/include -o event-test event-test.c -L/usr/local/lib -levent
  */
 
-#include <event-config.h>
+#include <event2/event-config.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
index 58524ccd1e7266ad97188750f0d36a936111f6c6..53c025f9cdce8f5fb6d233d72dca74285b6c550b 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <sys/types.h>
 
-#include <event-config.h>
+#include <event2/event-config.h>
 
 #include <sys/stat.h>
 #ifndef WIN32
index 619bec3847ebdf1fd2d8db4f6085d3bb7347fee1..61b4a6c1d9aa59c36aed65148cb410d2d7cc7c6c 100644 (file)
@@ -10,7 +10,7 @@
 
 #include <sys/types.h>
 
-#include <event-config.h>
+#include <event2/event-config.h>
 
 #include <sys/stat.h>
 #ifndef WIN32
index 0b9278577d4e2ce559dbeeb600b6bbfa377efd54..9fafce31dcb553ed758fa335959fb99e4f64703b 100644 (file)
--- 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 <sys/types.h>
 #ifdef _EVENT_HAVE_SYS_TIME_H
index 386f4763983aa8700c976d5523bcfe1b4516323e..3c474d33a413ef41ef90a63f3f3141e1a9d10868 100644 (file)
--- 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
index 358daae78cc2bafcf4caae9dc449b57e5a6842d3..1968c0031276e721e85b9eaa6a73fa5ec93a50e4 100644 (file)
@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifndef _EVENT_HAVE_STRLCPY
 #include <string.h>
index 97f81b9065a455dce7330d87e05459b3214be04c..11053c331befaa9a1c8312d05d182d6cf03caa4a 100644 (file)
--- 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 <sys/types.h>
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifndef _EVENT_HAVE_STRLCPY
 #include "strlcpy-internal.h"
index c95aa49f5ed82ea76849ce7f427fcb133d8242de..6c13303778d2faf9e85cce2a2cfa79faf1b4f3f5 100644 (file)
@@ -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
index d1629daa12b6ce7fcebd18be5e175d5e43a43b2f..76717d777b400df811e9e733145df59a71b456d7 100644 (file)
@@ -33,7 +33,7 @@
  *
  */
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
index bf0f032da4c551dffcf9fa00db376a433cb5a2cb..6b508ef13aba5ca88c8aa5df859ffa6f722bf8fb 100644 (file)
@@ -25,7 +25,7 @@
  *
  */
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
index 44a50597d5578e0b13a6f8209fce1461b7d3c0db..fdcf49dd60ded8dafa3ae863d042245152c0e826 100644 (file)
@@ -25,7 +25,7 @@
  *
  */
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
index 82c7c3b6065baa7768b54574e90a813b77f5b12b..8ce68e77c80da0a1f9e9f0d5d3ac5aa91a380251 100644 (file)
@@ -30,7 +30,7 @@
 #include <windows.h>
 #endif
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
index ea97d126090dadc8308d269dc0ef838819794485..65802a251d3d2fddd72cbc54a6dd64402e7d48c4 100644 (file)
@@ -30,7 +30,7 @@
 #include <windows.h>
 #endif
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
index df769f5a8bdb573e3221166e97938288f41502f4..b227108494f778878cc942bb167b3edca4ae923b 100644 (file)
@@ -30,7 +30,7 @@
 #include <windows.h>
 #endif
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -58,7 +58,7 @@
 #include <arpa/inet.h>
 #endif
 
-#include "event-config.h"
+#include "event2/event-config.h"
 #include "event2/event.h"
 #include "event2/event_struct.h"
 #include "event2/event_compat.h"
index deee766ee14771db7410eb9f3d7be9f95fcc4190..a2d9b10d36aea4a8cb24c3a6e0c8d47157bfb31c 100644 (file)
@@ -31,7 +31,7 @@
 #include <ws2tcpip.h>
 #endif
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
index 87ecc5baca1864e4ab89aa237fa98cda80b19a09..0cba756415d1615e6009971a3ded97f83dcd49cb 100644 (file)
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <event-config.h>
+#include <event2/event-config.h>
 
 #ifdef WIN32
 #include <winsock2.h>
index 99fb4a2ce60919af35246937047be3606d528f10..3625f8606b298f21466eae8c68b8c4d757925994 100644 (file)
@@ -30,7 +30,7 @@
 #include <windows.h>
 #endif
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
index 822ea80b14ebda40643cd27eb584b2e3fbe1876b..29d8247529398c61cda2de56376e0d738391f218 100644 (file)
@@ -32,7 +32,7 @@
 #include <fcntl.h>
 #endif
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifdef _EVENT___func__
 #define __func__ _EVENT___func__
@@ -71,7 +71,7 @@
 #include <event2/dns_compat.h>
 #include <event2/thread.h>
 
-#include "event-config.h"
+#include "event2/event-config.h"
 #include "regress.h"
 #include "tinytest.h"
 #include "tinytest_macros.h"
index 27e59012e7c5d60d2715714d011934464e5831f6..39dd99b9dd6e063809f8dac9b769e8c38d6c6be5 100644 (file)
@@ -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 <sys/types.h>
 #include <stdio.h>
index 482f9a77737c1c30551cee9a8072b0432c33f89c..79e094bbe4c42a75b3b5173d4ea6ba58618b807e 100644 (file)
@@ -30,7 +30,7 @@
 #include <windows.h>
 #endif
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
index bb174833f6365c85dbf41e924e4d3f9877a7b3d4..f2eeb8b5ecfafc7840041c9a32b2d77f607da038 100644 (file)
@@ -30,7 +30,7 @@
 #include <ws2tcpip.h>
 #endif
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
index 47b5cbfdd56676d600879d62856acb35945aff8e..16277a121e8406ef64b4eccb0031a1a66c72c459 100644 (file)
@@ -29,7 +29,7 @@
 #include <ws2tcpip.h>
 #endif
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #include <sys/types.h>
 
index 5ef78ea96e74a44238005003133ac3e54d639a13..5e7a37c1021a7d2e2a5a383efeb5b3d197da9895 100644 (file)
@@ -29,7 +29,7 @@
 #include <windows.h>
 #endif
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #include <sys/types.h>
 #ifndef WIN32
index 59a312be351424a3edd37c34f688ccbcf4408a78..7a328f20bfd5794cff3fbc1c7a1009d9025bda16 100644 (file)
@@ -2,7 +2,7 @@
  *  based on test-eof.c
  */
 
-#include "event-config.h"
+#include "event2/event-config.h"
 
 #ifdef WIN32
 #include <winsock2.h>
index 001370a8c58eea33b71260d583cc3a654fd3817c..fd226193578210184c36c155fade09e62605f4f8 100644 (file)
@@ -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 <winsock2.h>
index 3806c15d4d0ccf2396bcc0f84a554e3e4f81a70d..967a0131d6d9472c171f73d63ea03f96f69ff57c 100644 (file)
@@ -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 <sys/types.h>
 #include <sys/stat.h>
index 24daf8c84985d29d54b1d65372fa84327c9ca323..acb4421a6b3c9e8c728683b23920a6a5e043860c 100644 (file)
@@ -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 <sys/types.h>
 #include <sys/stat.h>
index 946d3a0b4bdc42950d76b1c1d3b67ca50147ebde..8d1b0ab8f74e377f4d0a1603364fb4d2df97ee57 100644 (file)
@@ -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 <winsock2.h>
index 459a247691bf1ec4de8d9db31c3c47a3eb6a9938..7d276164b5c12957391bbd9e729c529c909922ab 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef _EVENT_UTIL_INTERNAL_H
 #define _EVENT_UTIL_INTERNAL_H
 
-#include "event-config.h"
+#include "event2/event-config.h"
 #include <errno.h>
 
 /* For EVUTIL_ASSERT */
index a3b8dd7dbc9cecb76c7f36eb35ad2bfffd18a253..103acb5a6dec77fc6d48463cf63ff5f4d1255d78 100644 (file)
@@ -38,7 +38,7 @@
 #include <errno.h>
 
 #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"