Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libevent Oops. As Matthias pointed out, I swapped '-' f...



details:   https://anonhg.NetBSD.org/src/rev/26dbae9c2230
branches:  trunk
changeset: 746774:26dbae9c2230
user:      tls <tls%NetBSD.org@localhost>
date:      Wed Aug 19 15:18:05 2009 +0000

description:
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.

diffstat:

 lib/libevent/Makefile |  6 +++---
 lib/libevent/event.h  |  3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r f371c8fd5dc3 -r 26dbae9c2230 lib/libevent/Makefile
--- a/lib/libevent/Makefile     Wed Aug 19 15:17:05 2009 +0000
+++ b/lib/libevent/Makefile     Wed Aug 19 15:18:05 2009 +0000
@@ -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>
diff -r f371c8fd5dc3 -r 26dbae9c2230 lib/libevent/event.h
--- a/lib/libevent/event.h      Wed Aug 19 15:17:05 2009 +0000
+++ b/lib/libevent/event.h      Wed Aug 19 15:18:05 2009 +0000
@@ -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>



Home | Main Index | Thread Index | Old Index