Remove event-private.h and switch to evconfig-private.h

diff --git a/Makefile.am b/Makefile.am
index ad5e2df5013f7e1e4c73c82209c528ce3c1ac16c..cab603d7bf6681276b23e45a776a04d46ebd88ec 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -125,10 +125,7 @@ if SIGNAL_SUPPORT
 SYS_SRC += signal.c
 endif
 
-BUILT_SOURCES = ./include/event2/event-config.h event-private.h
-
-event-private.h: config.h
-       cp config.h $@
+BUILT_SOURCES = ./include/event2/event-config.h
 
 ./include/event2/event-config.h: config.h
        @MKDIR_P@ ./include/event2
@@ -196,7 +193,7 @@ 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 \
-       event-private.h \
+       evconfig-private.h \
        WIN32-Code/event2/event-config.h \
        WIN32-Code/tree.h \
        compat/sys/queue.h
@@ -211,5 +208,5 @@ doxygen: FORCE
        doxygen $(srcdir)/Doxyfile
 FORCE:
 
-DISTCLEANFILES = *~ libevent.pc ./include/event2/event-config.h event-private.h
+DISTCLEANFILES = *~ libevent.pc ./include/event2/event-config.h
 

diff --git a/buffer.c b/buffer.c
index 94a30bc5ec5fd2ff97283ea7247bf7afe578e893..2482572e708bd2f99c918fd41e418e9ea3e76936 100644 (file)
--- a/buffer.c
+++ b/buffer.c
@@ -26,7 +26,7 @@
  */
 
 #include "event2/event-config.h"
-#include "event-private.h"
+#include "evconfig-private.h"
 
 #ifdef WIN32
 #include <winsock2.h>

diff --git a/evthread_pthread.c b/evthread_pthread.c
index 5a56359d299e90c4824f84fd6d7e863851191ee4..0eb363e90c5b22c155fa5e98b9cfc97f61618bb5 100644 (file)
--- a/evthread_pthread.c
+++ b/evthread_pthread.c
@@ -28,7 +28,7 @@
 /* With glibc we need to define this to get PTHREAD_MUTEX_RECURSIVE.
  * _GNU_SOURCE, now from event-private
  */
-#include "event-private.h"
+#include "evconfig-private.h"
 #include <pthread.h>
 
 struct event_base;

diff --git a/evutil.c b/evutil.c
index 5c2e8395d1eb9394e74fb6af34d9ce96fc7cd87f..f610736c43de0504496583cf820754a8eb4956db 100644 (file)
--- a/evutil.c
+++ b/evutil.c
@@ -25,8 +25,7 @@
  */
 
 #include "event2/event-config.h"
-
-#include "event-private.h"
+#include "evconfig-private.h"
 
 #ifdef WIN32
 #include <winsock2.h>