rolling back r339: evconfig.h does not work

svn:r341
2025-09-08 11:53:00 -04:00 · 2007-03-01 06:25:18 +00:00 · 2007-03-01 06:25:18 +00:00 · b5d2f9a255
commit b5d2f9a255
parent 8d94bd03eb
32 changed files with 38 additions and 32 deletions
--- 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)

--- a/WIN32-Code/evconfig.h
+++ b/WIN32-Code/evconfig.h
--- 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>
--- 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

--- a/buffer.c
+++ b/buffer.c
@ -26,7 +26,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif

 #ifdef HAVE_VASPRINTF
--- 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.
--- 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>
--- 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>
--- 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
--- 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
--- 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
--- a/event.h
+++ b/event.h
@ -31,7 +31,6 @@
 extern "C" {
 #endif

-#include <evconfig.h>
 #include <stdarg.h>

 #ifdef WIN32
--- 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
--- 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
--- 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
--- 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
--- 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>
--- a/log.c
+++ b/log.c
@ -38,7 +38,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "evconfig.h"
+#include "config.h"
 #endif

 #ifdef WIN32
--- 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>
--- 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 */
--- 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

--- 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>
--- 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>
--- 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>
--- 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>
--- 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
--- 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
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>