Source-Changes-HG archive

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

[src/trunk]: src/libexec/httpd s/USE_NBUTIL/HAVE_NBUTIL_H/, to match the Make...



details:   https://anonhg.NetBSD.org/src/rev/d00e21ee7796
branches:  trunk
changeset: 341197:d00e21ee7796
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Oct 25 19:06:49 2015 +0000

description:
s/USE_NBUTIL/HAVE_NBUTIL_H/, to match the Makefile.
fixes a merge problem in introduced when merging the QNX patches.

from Jan Danielsson.

diffstat:

 libexec/httpd/bozohttpd.h |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 1b010faabee2 -r d00e21ee7796 libexec/httpd/bozohttpd.h
--- a/libexec/httpd/bozohttpd.h Sun Oct 25 16:01:04 2015 +0000
+++ b/libexec/httpd/bozohttpd.h Sun Oct 25 19:06:49 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bozohttpd.h,v 1.36 2015/08/05 06:50:44 mrg Exp $       */
+/*     $NetBSD: bozohttpd.h,v 1.37 2015/10/25 19:06:49 mrg Exp $       */
 
 /*     $eterna: bozohttpd.h,v 1.39 2011/11/18 09:21:15 mrg Exp $       */
 
@@ -42,7 +42,7 @@
 #include <stdio.h>
 
 /* QNX provides a lot of NetBSD things in nbutil.h */
-#ifdef USE_NBUTIL
+#ifdef HAVE_NBUTIL_H
 #include <nbutil.h>
 #endif
 



Home | Main Index | Thread Index | Old Index