[src/trunk]: src/external/bsd/bind/dist/lib/isc make the non-threaded case wo...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4729604043f0
branches:  trunk
changeset: 325371:4729604043f0
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Dec 20 16:58:34 2013 +0000

description:
make the non-threaded case work again.

diffstat:

 external/bsd/bind/dist/lib/isc/mem.c      |  10 ++++------
 external/bsd/bind/dist/lib/isc/unix/app.c |  17 ++++++++++-------
 2 files changed, 14 insertions(+), 13 deletions(-)

diffs (87 lines):

diff -r 500aba701eeb -r 4729604043f0 external/bsd/bind/dist/lib/isc/mem.c
--- a/external/bsd/bind/dist/lib/isc/mem.c      Fri Dec 20 15:35:48 2013 +0000
+++ b/external/bsd/bind/dist/lib/isc/mem.c      Fri Dec 20 16:58:34 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mem.c,v 1.6 2013/07/27 19:23:13 christos Exp $ */
+/*     $NetBSD: mem.c,v 1.7 2013/12/20 16:58:34 christos Exp $ */
 
 /*
  * Copyright (C) 2004-2010, 2012  Internet Systems Consortium, Inc. ("ISC")
@@ -310,8 +310,6 @@
 isc__mempool_getfillcount(isc_mempool_t *mpctx);
 ISC_MEMFUNC_SCOPE void
 isc__mem_printactive(isc_mem_t *ctx0, FILE *file);
-ISC_MEMFUNC_SCOPE void
-isc__mem_printallactive(FILE *file);
 
 unsigned int
 isc__mem_references(isc_mem_t *ctx0);
@@ -351,7 +349,7 @@
        (void *)isc__mem_getquota, (void *)isc__mem_setname,
        (void *)isc__mem_getname, (void *)isc__mem_gettag,
        (void *)isc__mem_printactive,
-       (void *)isc__mem_printallactive,
+       (void *)isc_mem_printallactive,
 
 };
 
@@ -2265,8 +2263,8 @@
 #endif
 }
 
-ISC_MEMFUNC_SCOPE void
-isc__mem_printallactive(FILE *file) {
+void
+isc_mem_printallactive(FILE *file) {
 #if !ISC_MEM_TRACKLINES
        UNUSED(file);
 #else
diff -r 500aba701eeb -r 4729604043f0 external/bsd/bind/dist/lib/isc/unix/app.c
--- a/external/bsd/bind/dist/lib/isc/unix/app.c Fri Dec 20 15:35:48 2013 +0000
+++ b/external/bsd/bind/dist/lib/isc/unix/app.c Fri Dec 20 16:58:34 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: app.c,v 1.6 2013/03/24 18:42:01 christos Exp $ */
+/*     $NetBSD: app.c,v 1.7 2013/12/20 16:58:34 christos Exp $ */
 
 /*
  * Copyright (C) 2004, 2005, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
@@ -534,11 +534,6 @@
        int result;
        isc_event_t *event, *next_event;
        isc_task_t *task;
-       sigset_t sset;
-       char strbuf[ISC_STRERRORSIZE];
-#ifdef HAVE_SIGWAIT
-       int sig;
-#endif
 
        REQUIRE(VALID_APPCTX(ctx));
 
@@ -582,10 +577,16 @@
        }
 #endif
 
+#ifdef ISC_PLATFORM_USETHREADS
        /*
         * When we are using multiple contexts, we don't rely on signals.
         */
        if (ctx == &isc_g_appctx) {
+       sigset_t sset;
+       char strbuf[ISC_STRERRORSIZE];
+#ifdef HAVE_SIGWAIT
+       int sig;
+#endif
 
        /*
         * There is no danger if isc_app_shutdown() is called before we wait
@@ -649,7 +650,9 @@
                if (ctx->want_shutdown && ctx->blocked)
                        exit(1);
        }
-       } else {
+       } else
+#endif
+       {
 
        (void)isc__taskmgr_dispatch(ctx->taskmgr);
 #ifndef ISC_PLATFORM_USETHREADS