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

Hotant-Bu · Jan 2, 2011 · 0915ca0 · 0915ca0
1 parent f6d66bc
commit 0915ca0
Show file tree

Hide file tree

Showing 38 changed files with 60 additions and 22 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -23,15 +23,15 @@
  * (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>
 
 #ifdef WIN32
 #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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -33,6 +33,7 @@
  */
 
 #include "event2/event-config.h"
+#include "evconfig-private.h"
 
 #include <limits.h>
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,7 @@ @@
      */
     #include "event2/event-config.h"
+    #include "evconfig-private.h"
     #ifndef _EVENT_DISABLE_THREAD_SUPPORT
@@ Expand Down @@