rolling back r339: evconfig.h does not work

svn:r341

diff --git a/Makefile.am b/Makefile.am
index 5a15ce3e6de998bdf079bc4cd2471d4884e7c38f..2739922e96a12deca0d5661ad8e2406e9b9bb8b2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ EXTRA_DIST = acconfig.h event.h event-internal.h log.h evsignal.h evdns.3 \
        test/test-eof.c test/test-weof.c test/test-time.c \
        test/test-init.c test/test.sh \
        compat/sys/queue.h compat/sys/tree.h compat/sys/_time.h \
-       WIN32-Code/evconfig.h WIN32-Code/misc.c \
+       WIN32-Code/config.h WIN32-Code/misc.c \
        WIN32-Code/win32.c WIN32-Code/misc.h \
        WIN32-Prj/event_test/event_test.dsp \
        WIN32-Prj/event_test/test.txt WIN32-Prj/libevent.dsp \
@@ -46,7 +46,7 @@ libevent_la_SOURCES = event.c buffer.c evbuffer.c log.c event_tagging.c \
 libevent_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS)
 libevent_la_LDFLAGS = -release @VERSION@ -version-info 1:3:0
 
-include_HEADERS = event.h evhttp.h evdns.h evconfig.h
+include_HEADERS = event.h evhttp.h evdns.h
 
 INCLUDES = -Icompat $(SYS_INCLUDES)
 

diff --git a/WIN32-Code/evconfig.h b/WIN32-Code/config.h
similarity index 100%
rename from WIN32-Code/evconfig.h
rename to WIN32-Code/config.h

diff --git a/WIN32-Code/win32.c b/WIN32-Code/win32.c
index 2ba0ae45d1834dd5451d9941f8d43c73914d78b4..867d1f22fd4382b59b5d3cdb248649f1d0c7c507 100644 (file)
--- a/WIN32-Code/win32.c
+++ b/WIN32-Code/win32.c
@@ -26,10 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef _MSC_VER
-#include "evconfig.h"
+#include "config.h"
 #else
 /* Avoid the windows/msvc thing. */
-#include "../evconfig.h"
+#include "../config.h"
 #endif
 
 #include <windows.h>

diff --git a/WIN32-Prj/libevent.dsp b/WIN32-Prj/libevent.dsp
index 67e71c8a76703bce480ccd55f54c0c50e6fa2671..61e9bc848eed9874e170b6f6da2bfea37318842e 100644 (file)
--- a/WIN32-Prj/libevent.dsp
+++ b/WIN32-Prj/libevent.dsp
@@ -109,7 +109,7 @@ SOURCE=..\acconfig.h
 # End Source File
 # Begin Source File
 
-SOURCE="..\WIN32-Code\evconfig.h"
+SOURCE="..\WIN32-Code\config.h"
 # End Source File
 # Begin Source File
 

diff --git a/buffer.c b/buffer.c
index d33e92926c1670ce40bb37a814fa49e259d2ec25..77efd0cfa3e207d76d28fc49cea55a3fd605d6f9 100644 (file)
--- a/buffer.c
+++ b/buffer.c
@@ -26,7 +26,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif
 
 #ifdef HAVE_VASPRINTF

diff --git a/configure.in b/configure.in
index bf5031f23177d266a677a99b661a18900aff90bf..c4faf015a5a208e5fd94de2e5efb3486f72156a1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl Dug Song <dugsong@monkey.org>
 AC_INIT(event.c)
 
 AM_INIT_AUTOMAKE(libevent,1.3a)
-AM_CONFIG_HEADER(evconfig.h)
+AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
 dnl Initialize prefix.

diff --git a/devpoll.c b/devpoll.c
index 359946c2f2f3557ae7c81c2f631e31b30d06cf1d..db897a9de230897081305f3ccfc718b30eb32808 100644 (file)
--- a/devpoll.c
+++ b/devpoll.c
@@ -25,7 +25,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif
 
 #include <sys/types.h>

diff --git a/epoll.c b/epoll.c
index 0d18d7623e91a83958d4c5b09d3be81719d6ffb3..e089e23d9e0928260e4651fad6ca43c26b0a0372 100644 (file)
--- a/epoll.c
+++ b/epoll.c
@@ -25,7 +25,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif
 
 #include <stdint.h>

diff --git a/evbuffer.c b/evbuffer.c
index ed4f3c37302532993c6336e2069f7438414d9289..52712bce58567cf2f871b892a3ee0c4c9699c774 100644 (file)
--- a/evbuffer.c
+++ b/evbuffer.c
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 
 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif
 
 #ifdef HAVE_SYS_TIME_H

diff --git a/evdns.c b/evdns.c
index 67c23dbbe74dede7bceeb56ed2fbdf47de683e34..b1e0644eac815ae45085629165510e2e32e981e5 100644 (file)
--- a/evdns.c
+++ b/evdns.c
@@ -36,7 +36,7 @@
 
 #include <sys/types.h>
 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif
 
 #ifdef WIN32

diff --git a/event.c b/event.c
index 0a89707645e7e35113c87cbfd17fbacc62d5e1d0..f6d2b1cc42caa29cffaf4c90237f700b1f3eb8ce 100644 (file)
--- a/event.c
+++ b/event.c
@@ -25,7 +25,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif
 
 #ifdef WIN32

diff --git a/event.h b/event.h
index 419f3407d1e8ffb7de8c93cd647564b4b1a87293..3f2032dd068ee675d8d403714cfe1ef154da0735 100644 (file)
--- a/event.h
+++ b/event.h
@@ -31,7 +31,6 @@
 extern "C" {
 #endif
 
-#include <evconfig.h>
 #include <stdarg.h>
 
 #ifdef WIN32

diff --git a/event_tagging.c b/event_tagging.c
index 91f903a3f455a914cfcd0afc5579e0559f274d11..6b1272435cb4e34770624b8ea3080c0e952b299d 100644 (file)
--- a/event_tagging.c
+++ b/event_tagging.c
@@ -29,7 +29,7 @@
 #include <sys/param.h>
 
 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif
 
 #ifdef WIN32

diff --git a/evport.c b/evport.c
index 818385b1cd3f0ffdcbd7be0d3fcafd610b524a9b..89bbd1eddad4efd697a311e431b60b9de20e46c0 100644 (file)
--- a/evport.c
+++ b/evport.c
@@ -52,7 +52,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif
 
 #ifdef HAVE_SYS_TIME_H

diff --git a/evrpc.c b/evrpc.c
index de3ac0dfd5ac7d08b7a0007cc9cc1c2b4a5edece..d575cd14adad88a621a78481f3a21a031a11a899 100644 (file)
--- a/evrpc.c
+++ b/evrpc.c
@@ -25,7 +25,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif
 
 #ifdef WIN32

diff --git a/http.c b/http.c
index 6b8ea6dbf55d81d4cb5cf3832297e722dbec9e93..6ff181de2a85bc0caded3ed8432382fcb371bbc4 100644 (file)
--- a/http.c
+++ b/http.c
@@ -29,7 +29,7 @@
 #include <sys/types.h>
 
 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif
 
 #ifdef HAVE_SYS_TIME_H

diff --git a/kqueue.c b/kqueue.c
index 1752c9d89b2324baa70aeb5b46789ec98802a958..08369c6dd51d93fd62dfbe0577ff0fae8105a6c5 100644 (file)
--- a/kqueue.c
+++ b/kqueue.c
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif
 
 #include <sys/types.h>

diff --git a/log.c b/log.c
index 0aacbae6ac06b75b4e9d177019dc0fa3e6bc687d..c9275e363fc55ed3270c0cf38e3da45372656042 100644 (file)
--- a/log.c
+++ b/log.c
@@ -38,7 +38,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif
 
 #ifdef WIN32

diff --git a/poll.c b/poll.c
index b51c3d465b572d8e2c080b530f4885b501a59512..14ca8453739b4c4575f6a9195184d00973d8d2d7 100644 (file)
--- a/poll.c
+++ b/poll.c
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif
 
 #include <sys/types.h>

diff --git a/rtsig.c b/rtsig.c
index 09ff0658c77a1a2b98df2a8a1a94a164c4d1c7c9..29aade6948dcdc23c2927e9c3dc7aa6453ff74b1 100644 (file)
--- a/rtsig.c
+++ b/rtsig.c
@@ -148,7 +148,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif
 
 /* Enable F_SETSIG and F_SETOWN */

diff --git a/sample/Makefile.am b/sample/Makefile.am
index 2e3a3457b5b441ad0cf45b25e005cbf18467ff93..b749b80656fc77bc04d4095997ae1626abc16a16 100644 (file)
--- a/sample/Makefile.am
+++ b/sample/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 
 LDADD = ../libevent.la
 CPPFPLAGS = -I.. 
-CFLAGS = -I../compat -I..
+CFLAGS = -I../compat
 
 noinst_PROGRAMS = event-test time-test signal-test
 

diff --git a/sample/signal-test.c b/sample/signal-test.c
index 63dd9547bf7a2c2a63fb403fd43dca5dd76a067d..98650ca11d59c2b29a3e6404ba0c79d6cf4958a4 100644 (file)
--- a/sample/signal-test.c
+++ b/sample/signal-test.c
@@ -5,6 +5,10 @@
 
 #include <sys/types.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/stat.h>
 #ifndef WIN32
 #include <sys/queue.h>

diff --git a/sample/time-test.c b/sample/time-test.c
index daa9daff776948018fba6e133d2190f6b05d1c33..f0f93995124cdc41483625195ea2d9be0b6e5ca2 100644 (file)
--- a/sample/time-test.c
+++ b/sample/time-test.c
@@ -2,10 +2,13 @@
  * Compile with:
  * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent
  */
-#include <evconfig.h>
 
 #include <sys/types.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/stat.h>
 #ifndef WIN32
 #include <sys/queue.h>

diff --git a/select.c b/select.c
index 804eacc20c444146d7c648bfd319c4a2552f8638..6ce81a232bbeebc97a1ff603dfcb7358374f3c20 100644 (file)
--- a/select.c
+++ b/select.c
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif
 
 #include <sys/types.h>

diff --git a/signal.c b/signal.c
index c9b967ed0b07e8428d088d729ea737842504cca8..71bcffcba5b39953c7c49105e82d51dd8d86caa7 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif
 
 #include <sys/types.h>

diff --git a/strlcpy-internal.h b/strlcpy-internal.h
index 43f0ebb5540ce380349676a50bb3ed4af6c0e797..22b5f61d45ed9215c4912adac3ddfb5a5176269a 100644 (file)
--- a/strlcpy-internal.h
+++ b/strlcpy-internal.h
@@ -6,7 +6,7 @@ extern "C" {
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif /* HAVE_CONFIG_H */
 
 #ifndef HAVE_STRLCPY

diff --git a/strlcpy.c b/strlcpy.c
index d21fec6530df64cfbbcb68fd3528afd861cb7dcb..5d194527c8caa929af40703a004699fbf5b622f1 100644 (file)
--- a/strlcpy.c
+++ b/strlcpy.c
@@ -34,7 +34,7 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp
 #include <sys/types.h>
 
 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif /* HAVE_CONFIG_H */
 
 #ifndef HAVE_STRLCPY

diff --git a/test/bench.c b/test/bench.c
index c97d1e64eaed1a6076809960ffc2b059d5b93c4c..61b050255bfe3dd526f8e5b91f9680c24f472ef4 100644 (file)
--- a/test/bench.c
+++ b/test/bench.c
@@ -34,7 +34,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif
 
 #include <sys/types.h>

diff --git a/test/regress.c b/test/regress.c
index d5e0bc45fd0f970816d70e4747d4e534cac51188..ff134dade5e8f62260a5f736baafbf590a62753f 100644 (file)
--- a/test/regress.c
+++ b/test/regress.c
@@ -31,7 +31,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif
 
 #include <sys/types.h>

diff --git a/test/regress_dns.c b/test/regress_dns.c
index c940f20062ae0d58fde6db3b91ede3798c0b4b7a..c65d3570d06c0a9a0d6f558770d1e3308ebb91dc 100644 (file)
--- a/test/regress_dns.c
+++ b/test/regress_dns.c
@@ -31,7 +31,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif
 
 #include <sys/types.h>

diff --git a/test/regress_http.c b/test/regress_http.c
index ae0699b1561576fa2051917c98a544fea17a7027..3fdaacb4350522972e03e017a42975bab6d0adab 100644 (file)
--- a/test/regress_http.c
+++ b/test/regress_http.c
@@ -31,7 +31,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif
 
 #include <sys/types.h>

diff --git a/test/regress_rpc.c b/test/regress_rpc.c
index 690312486c16bae1ac34c2c6cb7fb90283720a05..785127b9ce57cdd845af79e481a5ac6f85187dc3 100644 (file)
--- a/test/regress_rpc.c
+++ b/test/regress_rpc.c
@@ -31,7 +31,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif
 
 #include <sys/types.h>