Module Name: src
Committed By: tls
Date: Wed Aug 19 15:18:05 UTC 2009
Modified Files:
src/lib/libevent: Makefile event.h
Log Message:
Oops. As Matthias pointed out, I swapped '-' for '_' in the previous
commit. Fix that. Also, some applications written for newer libevent
want event.h to pull in event_config.h by magic.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libevent/Makefile
cvs rdiff -u -r1.6 -r1.7 src/lib/libevent/event.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libevent/Makefile
diff -u src/lib/libevent/Makefile:1.7 src/lib/libevent/Makefile:1.8
--- src/lib/libevent/Makefile:1.7 Wed Aug 19 01:38:39 2009
+++ src/lib/libevent/Makefile Wed Aug 19 15:18:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/08/19 01:38:39 tls Exp $
+# $NetBSD: Makefile,v 1.8 2009/08/19 15:18:05 tls Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
NOLINT= # Until someone explains to me how to avoid lint stupidity
@@ -11,7 +11,7 @@
SRCS= buffer.c evbuffer.c evdns.c event.c event_tagging.c evrpc.c evutil.c \
http.c kqueue.c log.c poll.c signal.c
-INCS= evdns.h event.h evhttp.h evrpc.h evutil.h event_config.h
+INCS= evdns.h event.h evhttp.h evrpc.h evutil.h event-config.h
INCSDIR=/usr/include
MAN= evdns.3 event.3
@@ -89,7 +89,7 @@
MLINKS+=evdns.3 evdns_search_ndots_set.3
MLINKS+=evdns.3 evdns_set_log_fn.3
-event_config.h: config.h
+event-config.h: config.h
sed -e 's/#define /#define _EVENT_/' ${.ALLSRC} > ${.OBJDIR}/${.TARGET}
.include <bsd.lib.mk>
Index: src/lib/libevent/event.h
diff -u src/lib/libevent/event.h:1.6 src/lib/libevent/event.h:1.7
--- src/lib/libevent/event.h:1.6 Wed Jul 8 21:23:53 2009
+++ src/lib/libevent/event.h Wed Aug 19 15:18:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: event.h,v 1.6 2009/07/08 21:23:53 tls Exp $ */
+/* $NetBSD: event.h,v 1.7 2009/08/19 15:18:05 tls Exp $ */
/* $OpenBSD: event.h,v 1.4 2002/07/12 18:50:48 provos Exp $ */
/*
@@ -165,6 +165,7 @@
extern "C" {
#endif
+#include <event-config.h>
#include <sys/types.h>
#include <sys/time.h>
#include <stdint.h>
