Source-Changes-HG archive

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

[src/trunk]: src/libexec/httpd also fix have_dynamic_content from the previou...



details:   https://anonhg.NetBSD.org/src/rev/7c7f43381e94
branches:  trunk
changeset: 446007:7c7f43381e94
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Nov 20 01:23:06 2018 +0000

description:
also fix have_dynamic_content from the previous previous.  re-order
the debug and dynamic content to match the same pattern as everything
else so similar problems are less likely in the future.

diffstat:

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

diffs (42 lines):

diff -r d92130b6b15b -r 7c7f43381e94 libexec/httpd/bozohttpd.h
--- a/libexec/httpd/bozohttpd.h Tue Nov 20 01:19:51 2018 +0000
+++ b/libexec/httpd/bozohttpd.h Tue Nov 20 01:23:06 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bozohttpd.h,v 1.53 2018/11/20 01:19:51 mrg Exp $       */
+/*     $NetBSD: bozohttpd.h,v 1.54 2018/11/20 01:23:06 mrg Exp $       */
 
 /*     $eterna: bozohttpd.h,v 1.39 2011/11/18 09:21:15 mrg Exp $       */
 
@@ -222,13 +222,13 @@
 #define BOZO_DEAD
 #endif
 
-#ifndef NO_DEBUG
+#ifdef NO_DEBUG
+#define        debug(x)
+#define have_debug     (0)
+#else
 void   debug__(bozohttpd_t *, int, const char *, ...) BOZO_PRINTFLIKE(3, 4);
 #define debug(x)       debug__ x
 #define have_debug     (1)
-#else
-#define        debug(x)
-#define have_debug     (0)
 #endif /* NO_DEBUG */
 
 int    bozo_http_error(bozohttpd_t *, int, bozo_httpreq_t *, const char *);
@@ -365,11 +365,11 @@
 const char *bozo_content_encoding(bozo_httpreq_t *, const char *);
 bozo_content_map_t *bozo_match_content_map(bozohttpd_t *, const char *, int);
 bozo_content_map_t *bozo_get_content_map(bozohttpd_t *, const char *);
-#ifndef NO_DYNAMIC_CONTENT
+#ifdef NO_DYNAMIC_CONTENT
+#define have_dynamic_content                           (0)
+#else
 void   bozo_add_content_map_mime(bozohttpd_t *, const char *, const char *,
                                  const char *, const char *);
-#define have_dynamic_content                           (0)
-#else
 #define have_dynamic_content                           (1)
 #endif
 



Home | Main Index | Thread Index | Old Index