Skip to content

Commit

Permalink
rolling back r339: evconfig.h does not work
Browse files Browse the repository at this point in the history 
svn:r341
  • Loading branch information
@provos
provos committed Mar 1, 2007
1 parent 8d94bd0 commit b5d2f9a
Show file tree
Hide file tree
Showing 32 changed files with 38 additions and 32 deletions.
4 changes: 2 additions & 2 deletions Makefile.am
View file
Expand Up @@ -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 \
Expand Down Expand Up @@ -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)

Expand Down
0 WIN32-Code/evconfig.h → WIN32-Code/config.h
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions WIN32-Code/win32.c
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion WIN32-Prj/libevent.dsp
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion buffer.c
View file
Expand Up @@ -26,7 +26,7 @@
*/

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

#ifdef HAVE_VASPRINTF
Expand Down
2 changes: 1 addition & 1 deletion configure.in
View file
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion devpoll.c
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion epoll.c
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion evbuffer.c
View file
Expand Up @@ -28,7 +28,7 @@
#include <sys/types.h>

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

#ifdef HAVE_SYS_TIME_H
Expand Down
2 changes: 1 addition & 1 deletion evdns.c
View file
Expand Up @@ -36,7 +36,7 @@

#include <sys/types.h>
#ifdef HAVE_CONFIG_H
#include "evconfig.h"
#include "config.h"
#endif

#ifdef WIN32
Expand Down
2 changes: 1 addition & 1 deletion event.c
View file
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion event.h
View file
Expand Up @@ -31,7 +31,6 @@
extern "C" {
#endif

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

#ifdef WIN32
Expand Down
2 changes: 1 addition & 1 deletion event_tagging.c
View file
Expand Up @@ -29,7 +29,7 @@
#include <sys/param.h>

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

#ifdef WIN32
Expand Down
2 changes: 1 addition & 1 deletion evport.c
View file
Expand Up @@ -52,7 +52,7 @@
*/

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

#ifdef HAVE_SYS_TIME_H
Expand Down
2 changes: 1 addition & 1 deletion evrpc.c
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion http.c
View file
Expand Up @@ -29,7 +29,7 @@
#include <sys/types.h>

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

#ifdef HAVE_SYS_TIME_H
Expand Down
2 changes: 1 addition & 1 deletion kqueue.c
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion log.c
View file
Expand Up @@ -38,7 +38,7 @@
*/

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

#ifdef WIN32
Expand Down
2 changes: 1 addition & 1 deletion poll.c
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion rtsig.c
View file
Expand Up @@ -148,7 +148,7 @@


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

/* Enable F_SETSIG and F_SETOWN */
Expand Down
2 changes: 1 addition & 1 deletion sample/Makefile.am
View file
Expand Up @@ -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

Expand Down
4 changes: 4 additions & 0 deletions sample/signal-test.c
View file
Expand Up @@ -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>
Expand Down
5 changes: 4 additions & 1 deletion sample/time-test.c
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion select.c
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion signal.c
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion strlcpy-internal.h
View file
Expand Up @@ -6,7 +6,7 @@ extern "C" {
#endif

#ifdef HAVE_CONFIG_H
#include "evconfig.h"
#include "config.h"
#endif /* HAVE_CONFIG_H */

#ifndef HAVE_STRLCPY
Expand Down
2 changes: 1 addition & 1 deletion strlcpy.c
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/bench.c
View file
Expand Up @@ -34,7 +34,7 @@
*/

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

#include <sys/types.h>
Expand Down
2 changes: 1 addition & 1 deletion test/regress.c
View file
Expand Up @@ -31,7 +31,7 @@
#endif

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

#include <sys/types.h>
Expand Down
2 changes: 1 addition & 1 deletion test/regress_dns.c
View file
Expand Up @@ -31,7 +31,7 @@
#endif

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

#include <sys/types.h>
Expand Down
2 changes: 1 addition & 1 deletion test/regress_http.c
View file
Expand Up @@ -31,7 +31,7 @@
#endif

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

#include <sys/types.h>
Expand Down
2 changes: 1 addition & 1 deletion test/regress_rpc.c
View file
Expand Up @@ -31,7 +31,7 @@
#endif

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

#include <sys/types.h>
Expand Down

0 comments on commit b5d2f9a

Please sign in to comment.