Skip to content
Browse files

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.
  • Loading branch information...
1 parent 5fa30d2 commit ec347b92251e188a13cbbfe0fe2e00aa14aeeca5 Nick Mathewson committed Jul 7, 2010
Showing with 100 additions and 97 deletions.
  1. +2 −0 .gitignore
  2. +10 −10 Makefile.am
  3. +1 −1 WIN32-Code/{ → event2}/event-config.h
  4. +2 −2 buffer.c
  5. +1 −1 buffer_iocp.c
  6. +1 −1 bufferevent-internal.h
  7. +1 −1 bufferevent.c
  8. +1 −1 bufferevent_async.c
  9. +1 −1 bufferevent_filter.c
  10. +1 −1 bufferevent_openssl.c
  11. +1 −1 bufferevent_pair.c
  12. +1 −1 bufferevent_sock.c
  13. +1 −0 configure.in
  14. +1 −1 defer-internal.h
  15. +1 −1 devpoll.c
  16. +1 −1 epoll.c
  17. +1 −1 evbuffer-internal.h
  18. +1 −1 evdns.c
  19. +1 −1 event-internal.h
  20. +1 −1 event.c
  21. +1 −1 event.h
  22. +1 −1 event_rpcgen.py
  23. +1 −1 event_tagging.c
  24. +1 −1 evmap.c
  25. +1 −1 evport.c
  26. +1 −1 evrpc.c
  27. +1 −1 evthread-internal.h
  28. +1 −1 evthread.c
  29. +1 −1 evthread_pthread.c
  30. +1 −1 evthread_win32.c
  31. +1 −1 evutil.c
  32. +1 −1 evutil_rand.c
  33. +1 −1 http.c
  34. +1 −1 include/Makefile.am
  35. +1 −1 include/event2/buffer.h
  36. +1 −1 include/event2/bufferevent.h
  37. +1 −1 include/event2/bufferevent_ssl.h
  38. +1 −1 include/event2/bufferevent_struct.h
  39. +1 −1 include/event2/dns_compat.h
  40. +1 −1 include/event2/dns_struct.h
  41. +1 −1 include/event2/event.h
  42. +1 −1 include/event2/event_compat.h
  43. +1 −1 include/event2/event_struct.h
  44. +1 −1 include/event2/http_compat.h
  45. +1 −1 include/event2/http_struct.h
  46. +1 −1 include/event2/tag.h
  47. +1 −1 include/event2/thread.h
  48. +1 −1 include/event2/util.h
  49. +1 −1 ipv6-internal.h
  50. +1 −1 kqueue.c
  51. +1 −1 listener.c
  52. +1 −1 log.c
  53. +1 −1 minheap-internal.h
  54. +1 −1 poll.c
  55. +1 −1 sample/Makefile.am
  56. +1 −1 sample/dns-example.c
  57. +1 −1 sample/event-test.c
  58. +1 −1 sample/signal-test.c
  59. +1 −1 sample/time-test.c
  60. +1 −1 select.c
  61. +1 −1 signal.c
  62. +1 −1 strlcpy-internal.h
  63. +1 −1 strlcpy.c
  64. +2 −2 test/Makefile.am
  65. +1 −1 test/bench.c
  66. +1 −1 test/bench_cascade.c
  67. +1 −1 test/bench_http.c
  68. +1 −1 test/regress.c
  69. +1 −1 test/regress_buffer.c
  70. +2 −2 test/regress_bufferevent.c
  71. +1 −1 test/regress_dns.c
  72. +1 −1 test/regress_et.c
  73. +1 −1 test/regress_http.c
  74. +2 −2 test/regress_main.c
  75. +1 −1 test/regress_pthread.c
  76. +1 −1 test/regress_rpc.c
  77. +1 −1 test/regress_testutils.c
  78. +1 −1 test/regress_util.c
  79. +1 −1 test/regress_zlib.c
  80. +1 −1 test/test-changelist.c
  81. +1 −1 test/test-eof.c
  82. +1 −1 test/test-init.c
  83. +1 −1 test/test-time.c
  84. +1 −1 test/test-weof.c
  85. +1 −1 util-internal.h
  86. +1 −1 win32select.c
View
2 .gitignore
@@ -66,6 +66,8 @@ libevent.pc
/missing
/stamp-h1
+/include/event2/event-config.h
+
/sample/dns-example
/sample/event-test
/sample/hello-world
View
20 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,20 +202,19 @@ 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
doxygen: FORCE
doxygen $(srcdir)/Doxyfile
FORCE:
-DISTCLEANFILES = *~ event-config.h libevent.pc
+DISTCLEANFILES = *~ libevent.pc ./include/event2/event-config.h
+
View
2 WIN32-Code/event-config.h → 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.
View
4 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"
View
2 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"
View
2 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"
View
2 bufferevent.c
@@ -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>
View
2 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 <sys/time.h>
View
2 bufferevent_filter.c
@@ -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>
View
2 bufferevent_openssl.c
@@ -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>
View
2 bufferevent_pair.c
@@ -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"
View
2 bufferevent_sock.c
@@ -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>
View
1 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
View
2 defer-internal.h
@@ -30,7 +30,7 @@
extern "C" {
#endif
-#include "event-config.h"
+#include "event2/event-config.h"
#include <sys/queue.h>
struct deferred_cb;
View
2 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>
View
2 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>
View
2 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"
View
2 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
View
2 event-internal.h
@@ -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"
View
2 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>
View
2 event.h
@@ -162,7 +162,7 @@
extern "C" {
#endif
-#include <event-config.h>
+#include <event2/event-config.h>
#ifdef _EVENT_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
View
2 event_rpcgen.py
@@ -1574,7 +1574,7 @@ def BodyPreamble(self, name, header_file):
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'
View
2 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 <sys/types.h>
View
2 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>
View
2 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>
View
2 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
View
2 evthread-internal.h
@@ -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;
View
2 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
View
2 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
View
2 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 <winsock2.h>
View
2 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
View
2 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"
View
2 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>
View
2 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
View
2 include/event2/buffer.h
@@ -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>
View
2 include/event2/bufferevent.h
@@ -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
View
2 include/event2/bufferevent_ssl.h
@@ -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>
View
2 include/event2/bufferevent_struct.h
@@ -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
View
2 include/event2/dns_compat.h
@@ -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
View
2 include/event2/dns_struct.h
@@ -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
View
2 include/event2/event.h
@@ -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
View
2 include/event2/event_compat.h
@@ -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
View
2 include/event2/event_struct.h
@@ -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
View
2 include/event2/http_compat.h
@@ -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
View
2 include/event2/http_struct.h
@@ -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
View
2 include/event2/tag.h
@@ -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
View
2 include/event2/thread.h
@@ -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. */
View
2 include/event2/util.h
@@ -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
View
2 ipv6-internal.h
@@ -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
View
2 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
View
2 listener.c
@@ -26,7 +26,7 @@
#include <sys/types.h>
-#include "event-config.h"
+#include "event2/event-config.h"
#ifdef WIN32
#include <winsock2.h>
View
2 log.c
@@ -37,7 +37,7 @@
* SUCH DAMAGE.
*/
-#include "event-config.h"
+#include "event2/event-config.h"
#ifdef WIN32
#include <winsock2.h>
View
2 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"
View
2 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
View
2 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
View
2 sample/dns-example.c
@@ -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>
View
2 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 <event-config.h>
+#include <event2/event-config.h>
#include <sys/types.h>
#include <sys/stat.h>
View
2 sample/signal-test.c
@@ -6,7 +6,7 @@
#include <sys/types.h>
-#include <event-config.h>
+#include <event2/event-config.h>
#include <sys/stat.h>
#ifndef WIN32
View
2 sample/time-test.c
@@ -10,7 +10,7 @@
#include <sys/types.h>
-#include <event-config.h>
+#include <event2/event-config.h>
#include <sys/stat.h>
#ifndef WIN32
View
2 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
View
2 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
View
2 strlcpy-internal.h
@@ -5,7 +5,7 @@
extern "C" {
#endif
-#include "event-config.h"
+#include "event2/event-config.h"
#ifndef _EVENT_HAVE_STRLCPY
#include <string.h>
View
2 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"
View
4 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
View
2 test/bench.c
@@ -33,7 +33,7 @@
*
*/
-#include "event-config.h"
+#include "event2/event-config.h"
#include <sys/types.h>
#include <sys/stat.h>
View
2 test/bench_cascade.c
@@ -25,7 +25,7 @@
*
*/
-#include "event-config.h"
+#include "event2/event-config.h"
#include <sys/types.h>
#include <sys/stat.h>
View
2 test/bench_http.c
@@ -25,7 +25,7 @@
*
*/
-#include "event-config.h"
+#include "event2/event-config.h"
#include <sys/types.h>
#include <sys/stat.h>
View
2 test/regress.c
@@ -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>
View
2 test/regress_buffer.c
@@ -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>
View
4 test/regress_bufferevent.c
@@ -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"
View
2 test/regress_dns.c
@@ -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>
View
2 test/regress_et.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>
#ifdef WIN32
#include <winsock2.h>
View
2 test/regress_http.c
@@ -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>
View
4 test/regress_main.c
@@ -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"
View
2 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 <sys/types.h>
#include <stdio.h>
View
2 test/regress_rpc.c
@@ -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>
View
2 test/regress_testutils.c
@@ -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>
View
2 test/regress_util.c
@@ -29,7 +29,7 @@
#include <ws2tcpip.h>
#endif
-#include "event-config.h"
+#include "event2/event-config.h"
#include <sys/types.h>
View
2 test/regress_zlib.c
@@ -29,7 +29,7 @@
#include <windows.h>
#endif
-#include "event-config.h"
+#include "event2/event-config.h"
#include <sys/types.h>
#ifndef WIN32
View
2 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 <winsock2.h>
View
2 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 <winsock2.h>
View
2 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 <sys/types.h>
#include <sys/stat.h>
View
2 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 <sys/types.h>
#include <sys/stat.h>
View
2 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 <winsock2.h>
View
2 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 <errno.h>
/* For EVUTIL_ASSERT */
View
2 win32select.c
@@ -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"

0 comments on commit ec347b9

Please sign in to comment.
Something went wrong with that request. Please try again.