Include evconfig-private.h in internal files for great good.

diff --git a/.gitignore b/.gitignore
index fae18eedbcb3b783cafab92786768a41e4dcbd55..d1f2496e6a4f4348c1a889d3b41cf5971115f199 100644 (file)
--- 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 2482572e708bd2f99c918fd41e418e9ea3e76936..bef226d6c8998aef70a678c2bd23cd4af6924766 100644 (file)
--- 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 67c89c2a27913734aa863290484288efc7d4a263..54289879bfaf59c5fc413e62cf601f297106dbf0 100644 (file)
--- 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 9d84e739e710ddc724ec6e2e4d2bc798fdc26cab..8c45fe9cae36e2f8ec7eecea89da38d4193eb4ec 100644 (file)
--- 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 4c9e38fa1abca07dab2a7f8ceb1497e5470c5df7..876a83f4b88382c60b1ad9d5508d2d5265154aa0 100644 (file)
--- 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 b7284fda6cb2dbeab9fcfcdb5b68a14445e3a02b..c00ade8949386c14d03eaa919c719fe0c5720c38 100644 (file)
--- 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 3d9a77012f0e396314500a645d9b3f89aaefa610..4c9047e51c78743a1686712d1436455c1df1d1ea 100644 (file)
--- 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 1e20f78b94abe0f3f375f7d608e0528427a8bf48..bc1039b93bbec605f6971217851ded8f80ebd93b 100644 (file)
--- 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 1d76ea14b0b6bf0a936bdd303f379b75e50e3c74..7502736caee73ee879665771e22b729812926a0e 100644 (file)
--- 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 8bfa848898954558cce5fbd3763e27f98d34a3f3..1892c556ea6f584d50302f34411317dd161e9027 100644 (file)
--- 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 55f89d28222d30a85c2ad555d51b5da2d750ec54..2a6a0aa2b60f62fdd3f011d2c3b1bf45a5ad95eb 100644 (file)
--- 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 0ea2349c7d940192df5e881c9eb5223470adeb74..7253358bf81c6c25b68f7242520e994a892d7646 100644 (file)
--- 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 7fc8b9147ad1f0c78fee4576c9a6d95575354b53..31495a967eb125ff5d129ae495fe2a34fc7be614 100644 (file)
--- 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 a1636a14e1a2b9cca29f6ee62ed728155dd3f27e..75e6b9975981a6176d7c931b40f2817b949c7d6d 100644 (file)
--- 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 e3da33da724ed8ac21f68b30931ee00682d19e3e..1171bd9e7294eb4504b45044013ab12308c07475 100644 (file)
--- 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 fedb9c73cfa293adb776bc3e6815669699880f90..fa8c722d8a9d02f7a719fe8e85d4ab7d1ecbe494 100644 (file)
--- 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 aaded70a3679b22ea362b58c349ac0357fc6afa6..f3ba1d2eac3209d53ef8d795af55a8c6ff1f938c 100644 (file)
--- 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 3bcad1172c8ed4fc3ee30b0049e92da43201b6df..77a53772318f7185e831d4ff8a959f832a4140c2 100644 (file)
--- 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 4301a39c7f3213ea81664ad97ade568fbb2be725..082e20ab2c5c87b2b65f650eebf93fff09ed4814 100644 (file)
--- 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 9d69299490cbaf2108413c75b857bcbaab54be0e..22dd57acdc319388d2667432b94b05cdb4b57acd 100644 (file)
--- 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 9317fdf1baeb75a86a488f4e6a69d26305fa18a8..847006ed1c7bba7dcf80a6171fb91e8a8e8f240d 100644 (file)
--- 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 35f14b2b2e8dffa7e1f0725c013d5e228fb0dc9c..c96c6fd911572b9e044129b26c91728dfcfdd444 100644 (file)
--- 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 0eb363e90c5b22c155fa5e98b9cfc97f61618bb5..b806922a9ce0d0a2110e545ad6fb99d1b8860020 100644 (file)
--- 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 bd72be15e5ac9877988a16bbbf3c744b935d38b9..73e545bfa07bc8aba78d74f06a3f136b2604d479 100644 (file)
--- 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 07ad2ea67ddf27d03706cd3fc2ca04e9affb88c6..85cd3e9ceb4dfd8df610206b6eb863e1649ffefa 100644 (file)
--- 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 f8de3b37f808e32cf85fd118cb1e40f410e035ca..29ea8e9935e827c88c09d00bbfe09b88c153d3ea 100644 (file)
--- 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 7d6fb7361b3f80d18bed814f89afa28de869ffc9..d5d1d3a3f9087a50d3eada8a2e81c4cf7632da34 100644 (file)
--- 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 12d4c19827e8e8a7fe4bb75bbea95e536ac21250..0db64abb74fd59cb644c50224c9529b37c17e6ed 100644 (file)
--- 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 d0911bdb8dad1b5bfbe3354354029a0510ce22ef..0f3cecf8ac0c0e37f532a73c7a66d76074fe33d7 100644 (file)
--- 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 f0cd4320d139dd913d3e549029f0d26c6113762b..142719cc7fb00d032da01590e3a28dc2c7ff2411 100644 (file)
--- 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 9734a7c72d023d84ac704062b49e152b0183cd32..8055e903c176316f87724b11ef3baa3d4436f639 100644 (file)
--- 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 63f238868e391c9f277ac4377097139099183a21..540d3a13196523cd33b35f0f935e9d993ea8b0b5 100644 (file)
--- 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 527462ca26ba167533cbaf48651e969c25f9bfad..0ad04468bc285eb731990de97127e4211afcebd6 100644 (file)
--- 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 ec27ea88428f966b2754a78c08fe24f5f43c857b..a700c12878d407ecfac9bf3d6b45d80e2cc7680f 100644 (file)
--- 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 1968c0031276e721e85b9eaa6a73fa5ec93a50e4..4152b7bd015fe0212d4aaf5553caa5865f84e5fd 100644 (file)
--- 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 11053c331befaa9a1c8312d05d182d6cf03caa4a..3656e9f0642a8308d1326affdc70d862f064f3c5 100644 (file)
--- 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 cb76ee4fdd590bf76a3f2a33e30237d720ca4146..ba596fab3f4111ff6b78b680e53aeb6492da6a41 100644 (file)
--- 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 70e7e6e8bc0fa967366ae9aaf603b15b7b4beb6f..d1f121bf1d3be2821e5a318c0a8189bafb546242 100644 (file)
--- 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"