summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--buffer.c1
-rw-r--r--buffer_iocp.c3
-rw-r--r--bufferevent-internal.h1
-rw-r--r--bufferevent.c5
-rw-r--r--bufferevent_async.c1
-rw-r--r--bufferevent_openssl.c5
-rw-r--r--bufferevent_pair.c4
-rw-r--r--bufferevent_sock.c5
-rw-r--r--defer-internal.h2
-rw-r--r--devpoll.c1
-rw-r--r--epoll.c1
-rw-r--r--evbuffer-internal.h1
-rw-r--r--evdns.c4
-rw-r--r--event-internal.h2
-rw-r--r--event.c1
-rw-r--r--event_tagging.c1
-rw-r--r--evmap.c1
-rw-r--r--evport.c1
-rw-r--r--evrpc.c1
-rw-r--r--evthread-internal.h4
-rw-r--r--evthread.c1
-rw-r--r--evthread_pthread.c6
-rw-r--r--evthread_win32.c1
-rw-r--r--evutil_rand.c1
-rw-r--r--http.c1
-rw-r--r--ipv6-internal.h4
-rw-r--r--kqueue.c1
-rw-r--r--listener.c5
-rw-r--r--log.c1
-rw-r--r--minheap-internal.h1
-rw-r--r--poll.c1
-rw-r--r--select.c1
-rw-r--r--signal.c1
-rw-r--r--strlcpy-internal.h1
-rw-r--r--strlcpy.c5
-rw-r--r--util-internal.h2
-rw-r--r--win32select.c3
38 files changed, 60 insertions, 22 deletions
diff --git a/.gitignore b/.gitignore
index fae18eed..d1f2496e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,6 +66,7 @@ libevent_openssl.pc
/ltmain.sh
/missing
/stamp-h1
+/stamp-h2
/include/event2/event-config.h
/evconfig-private.h
diff --git a/buffer.c b/buffer.c
index 2482572e..bef226d6 100644
--- a/buffer.c
+++ b/buffer.c
@@ -85,7 +85,6 @@
#include "event2/bufferevent_compat.h"
#include "event2/bufferevent_struct.h"
#include "event2/thread.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 67c89c2a..54289879 100644
--- a/buffer_iocp.c
+++ b/buffer_iocp.c
@@ -30,12 +30,13 @@
This module implements overlapped read and write functions for evbuffer
objects on Windows.
*/
+#include "event2/event-config.h"
+#include "evconfig-private.h"
#include "event2/buffer.h"
#include "event2/buffer_compat.h"
#include "event2/util.h"
#include "event2/thread.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 9d84e739..8c45fe9c 100644
--- a/bufferevent-internal.h
+++ b/bufferevent-internal.h
@@ -31,6 +31,7 @@ extern "C" {
#endif
#include "event2/event-config.h"
+#include "evconfig-private.h"
#include "event2/util.h"
#include "defer-internal.h"
#include "evthread-internal.h"
diff --git a/bufferevent.c b/bufferevent.c
index 4c9e38fa..876a83f4 100644
--- a/bufferevent.c
+++ b/bufferevent.c
@@ -25,9 +25,10 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
-
#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#include <sys/types.h>
#ifdef _EVENT_HAVE_SYS_TIME_H
#include <sys/time.h>
diff --git a/bufferevent_async.c b/bufferevent_async.c
index b7284fda..c00ade89 100644
--- a/bufferevent_async.c
+++ b/bufferevent_async.c
@@ -27,6 +27,7 @@
*/
#include "event2/event-config.h"
+#include "evconfig-private.h"
#ifdef _EVENT_HAVE_SYS_TIME_H
#include <sys/time.h>
diff --git a/bufferevent_openssl.c b/bufferevent_openssl.c
index 3d9a7701..4c9047e5 100644
--- a/bufferevent_openssl.c
+++ b/bufferevent_openssl.c
@@ -24,9 +24,10 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
-
#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#include <sys/types.h>
#ifdef _EVENT_HAVE_SYS_TIME_H
#include <sys/time.h>
diff --git a/bufferevent_pair.c b/bufferevent_pair.c
index 1e20f78b..bc1039b9 100644
--- a/bufferevent_pair.c
+++ b/bufferevent_pair.c
@@ -23,6 +23,8 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "event2/event-config.h"
+#include "evconfig-private.h"
#include <sys/types.h>
@@ -30,8 +32,6 @@
#include <winsock2.h>
#endif
-#include "event2/event-config.h"
-
#include "event2/util.h"
#include "event2/buffer.h"
#include "event2/bufferevent.h"
diff --git a/bufferevent_sock.c b/bufferevent_sock.c
index 1d76ea14..7502736c 100644
--- a/bufferevent_sock.c
+++ b/bufferevent_sock.c
@@ -26,9 +26,10 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
-
#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#include <sys/types.h>
#ifdef _EVENT_HAVE_SYS_TIME_H
#include <sys/time.h>
diff --git a/defer-internal.h b/defer-internal.h
index 8bfa8488..1892c556 100644
--- a/defer-internal.h
+++ b/defer-internal.h
@@ -31,6 +31,8 @@ extern "C" {
#endif
#include "event2/event-config.h"
+#include "evconfig-private.h"
+
#include <sys/queue.h>
struct deferred_cb;
diff --git a/devpoll.c b/devpoll.c
index 55f89d28..2a6a0aa2 100644
--- a/devpoll.c
+++ b/devpoll.c
@@ -25,6 +25,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "event2/event-config.h"
+#include "evconfig-private.h"
#include <sys/types.h>
#include <sys/resource.h>
diff --git a/epoll.c b/epoll.c
index 0ea2349c..7253358b 100644
--- a/epoll.c
+++ b/epoll.c
@@ -25,6 +25,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "event2/event-config.h"
+#include "evconfig-private.h"
#include <stdint.h>
#include <sys/types.h>
diff --git a/evbuffer-internal.h b/evbuffer-internal.h
index 7fc8b914..31495a96 100644
--- a/evbuffer-internal.h
+++ b/evbuffer-internal.h
@@ -32,6 +32,7 @@ extern "C" {
#endif
#include "event2/event-config.h"
+#include "evconfig-private.h"
#include "event2/util.h"
#include "util-internal.h"
#include "defer-internal.h"
diff --git a/evdns.c b/evdns.c
index a1636a14..75e6b997 100644
--- a/evdns.c
+++ b/evdns.c
@@ -34,8 +34,10 @@
* Version: 0.1b
*/
-#include <sys/types.h>
#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#include <sys/types.h>
#ifndef _FORTIFY_SOURCE
#define _FORTIFY_SOURCE 3
diff --git a/event-internal.h b/event-internal.h
index e3da33da..1171bd9e 100644
--- a/event-internal.h
+++ b/event-internal.h
@@ -32,6 +32,8 @@ extern "C" {
#endif
#include "event2/event-config.h"
+#include "evconfig-private.h"
+
#include <sys/queue.h>
#include "event2/event_struct.h"
#include "minheap-internal.h"
diff --git a/event.c b/event.c
index fedb9c73..fa8c722d 100644
--- a/event.c
+++ b/event.c
@@ -25,6 +25,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "event2/event-config.h"
+#include "evconfig-private.h"
#ifdef WIN32
#include <winsock2.h>
diff --git a/event_tagging.c b/event_tagging.c
index aaded70a..f3ba1d2e 100644
--- a/event_tagging.c
+++ b/event_tagging.c
@@ -26,6 +26,7 @@
*/
#include "event2/event-config.h"
+#include "evconfig-private.h"
#ifdef _EVENT_HAVE_SYS_TYPES_H
#include <sys/types.h>
diff --git a/evmap.c b/evmap.c
index 3bcad117..77a53772 100644
--- a/evmap.c
+++ b/evmap.c
@@ -24,6 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "event2/event-config.h"
+#include "evconfig-private.h"
#ifdef WIN32
#include <winsock2.h>
diff --git a/evport.c b/evport.c
index 4301a39c..082e20ab 100644
--- a/evport.c
+++ b/evport.c
@@ -51,6 +51,7 @@
*/
#include "event2/event-config.h"
+#include "evconfig-private.h"
#include <sys/time.h>
#include <sys/queue.h>
diff --git a/evrpc.c b/evrpc.c
index 9d692994..22dd57ac 100644
--- a/evrpc.c
+++ b/evrpc.c
@@ -25,6 +25,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "event2/event-config.h"
+#include "evconfig-private.h"
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
diff --git a/evthread-internal.h b/evthread-internal.h
index 9317fdf1..847006ed 100644
--- a/evthread-internal.h
+++ b/evthread-internal.h
@@ -30,8 +30,10 @@
extern "C" {
#endif
-#include "event2/thread.h"
#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#include "event2/thread.h"
#include "util-internal.h"
struct event_base;
diff --git a/evthread.c b/evthread.c
index 35f14b2b..c96c6fd9 100644
--- a/evthread.c
+++ b/evthread.c
@@ -25,6 +25,7 @@
*/
#include "event2/event-config.h"
+#include "evconfig-private.h"
#ifndef _EVENT_DISABLE_THREAD_SUPPORT
diff --git a/evthread_pthread.c b/evthread_pthread.c
index 0eb363e9..b806922a 100644
--- a/evthread_pthread.c
+++ b/evthread_pthread.c
@@ -24,11 +24,11 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "event2/event-config.h"
+#include "evconfig-private.h"
-/* With glibc we need to define this to get PTHREAD_MUTEX_RECURSIVE.
- * _GNU_SOURCE, now from event-private
+/* With glibc we need to define _GNU_SOURCE to get PTHREAD_MUTEX_RECURSIVE.
+ * This comes from evconfig-private.h
*/
-#include "evconfig-private.h"
#include <pthread.h>
struct event_base;
diff --git a/evthread_win32.c b/evthread_win32.c
index bd72be15..73e545bf 100644
--- a/evthread_win32.c
+++ b/evthread_win32.c
@@ -24,6 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "event2/event-config.h"
+#include "evconfig-private.h"
#ifdef WIN32
#include <winsock2.h>
diff --git a/evutil_rand.c b/evutil_rand.c
index 07ad2ea6..85cd3e9c 100644
--- a/evutil_rand.c
+++ b/evutil_rand.c
@@ -33,6 +33,7 @@
*/
#include "event2/event-config.h"
+#include "evconfig-private.h"
#include <limits.h>
diff --git a/http.c b/http.c
index f8de3b37..29ea8e99 100644
--- a/http.c
+++ b/http.c
@@ -26,6 +26,7 @@
*/
#include "event2/event-config.h"
+#include "evconfig-private.h"
#ifdef _EVENT_HAVE_SYS_PARAM_H
#include <sys/param.h>
diff --git a/ipv6-internal.h b/ipv6-internal.h
index 7d6fb736..d5d1d3a3 100644
--- a/ipv6-internal.h
+++ b/ipv6-internal.h
@@ -30,11 +30,13 @@
#ifndef _EVENT_IPV6_INTERNAL_H
#define _EVENT_IPV6_INTERNAL_H
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
#include <sys/types.h>
#ifdef _EVENT_HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
-#include "event2/event-config.h"
#include "event2/util.h"
#ifdef __cplusplus
diff --git a/kqueue.c b/kqueue.c
index 12d4c198..0db64abb 100644
--- a/kqueue.c
+++ b/kqueue.c
@@ -27,7 +27,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "event2/event-config.h"
-
#include "event-private.h"
#include <sys/types.h>
diff --git a/listener.c b/listener.c
index d0911bdb..0f3cecf8 100644
--- a/listener.c
+++ b/listener.c
@@ -24,9 +24,10 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
-
#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#include <sys/types.h>
#ifdef WIN32
#include <winsock2.h>
diff --git a/log.c b/log.c
index f0cd4320..142719cc 100644
--- a/log.c
+++ b/log.c
@@ -38,6 +38,7 @@
*/
#include "event2/event-config.h"
+#include "evconfig-private.h"
#ifdef WIN32
#include <winsock2.h>
diff --git a/minheap-internal.h b/minheap-internal.h
index 9734a7c7..8055e903 100644
--- a/minheap-internal.h
+++ b/minheap-internal.h
@@ -29,6 +29,7 @@
#define _MIN_HEAP_H_
#include "event2/event-config.h"
+#include "evconfig-private.h"
#include "event2/event.h"
#include "event2/event_struct.h"
#include "event2/util.h"
diff --git a/poll.c b/poll.c
index 63f23886..540d3a13 100644
--- a/poll.c
+++ b/poll.c
@@ -27,6 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "event2/event-config.h"
+#include "evconfig-private.h"
#include <sys/types.h>
#ifdef _EVENT_HAVE_SYS_TIME_H
diff --git a/select.c b/select.c
index 527462ca..0ad04468 100644
--- a/select.c
+++ b/select.c
@@ -27,6 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "event2/event-config.h"
+#include "evconfig-private.h"
#include <sys/types.h>
#ifdef _EVENT_HAVE_SYS_TIME_H
diff --git a/signal.c b/signal.c
index ec27ea88..a700c128 100644
--- a/signal.c
+++ b/signal.c
@@ -27,6 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "event2/event-config.h"
+#include "evconfig-private.h"
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
diff --git a/strlcpy-internal.h b/strlcpy-internal.h
index 1968c003..4152b7bd 100644
--- a/strlcpy-internal.h
+++ b/strlcpy-internal.h
@@ -6,6 +6,7 @@ extern "C" {
#endif
#include "event2/event-config.h"
+#include "evconfig-private.h"
#ifndef _EVENT_HAVE_STRLCPY
#include <string.h>
diff --git a/strlcpy.c b/strlcpy.c
index 11053c33..3656e9f0 100644
--- a/strlcpy.c
+++ b/strlcpy.c
@@ -31,9 +31,10 @@
static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
-#include <sys/types.h>
-
#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#include <sys/types.h>
#ifndef _EVENT_HAVE_STRLCPY
#include "strlcpy-internal.h"
diff --git a/util-internal.h b/util-internal.h
index cb76ee4f..ba596fab 100644
--- a/util-internal.h
+++ b/util-internal.h
@@ -27,6 +27,8 @@
#define _EVENT_UTIL_INTERNAL_H
#include "event2/event-config.h"
+#include "evconfig-private.h"
+
#include <errno.h>
/* For EVUTIL_ASSERT */
diff --git a/win32select.c b/win32select.c
index 70e7e6e8..d1f121bf 100644
--- a/win32select.c
+++ b/win32select.c
@@ -25,6 +25,8 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "event2/event-config.h"
+#include "evconfig-private.h"
#include <winsock2.h>
#include <windows.h>
@@ -38,7 +40,6 @@
#include <errno.h>
#include "event2/util.h"
-#include "event2/event-config.h"
#include "util-internal.h"
#include "log-internal.h"
#include "event2/event.h"
View Lorry Controller Status