Module Name: src
Committed By: mrg
Date: Sun Oct 25 19:06:49 UTC 2015
Modified Files:
src/libexec/httpd: bozohttpd.h
Log Message:
s/USE_NBUTIL/HAVE_NBUTIL_H/, to match the Makefile.
fixes a merge problem in introduced when merging the QNX patches.
from Jan Danielsson.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/libexec/httpd/bozohttpd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/bozohttpd.h
diff -u src/libexec/httpd/bozohttpd.h:1.36 src/libexec/httpd/bozohttpd.h:1.37
--- src/libexec/httpd/bozohttpd.h:1.36 Wed Aug 5 06:50:44 2015
+++ src/libexec/httpd/bozohttpd.h Sun Oct 25 19:06:49 2015
@@ -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
