Remove now dummy HAVE_UNIXWARE_SIGWAIT define

diff --git a/acconfig.h b/acconfig.h
index 4b1304f2734dca9f90c470028bd47dd63a8d216e..43a2e90993324f008093d207684c1f25436ae2ec 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -20,9 +20,6 @@
 /** define if your system has sigwait() */
 #undef HAVE_SIGWAIT
 
-/** define if sigwait() is the UnixWare flavor */
-#undef HAVE_UNIXWARE_SIGWAIT
-
 /** define if sysconf() is available */
 #undef HAVE_SYSCONF
 

diff --git a/config.h.in b/config.h.in
index c5283ae70e53d0dc8fbecc2cd00762ec2e746bc4..f2ad6c379ef9076074cadcf35cd54c41dd03e4c2 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -20,9 +20,6 @@
 /** define if your system has sigwait() */
 #undef HAVE_SIGWAIT
 
-/** define if sigwait() is the UnixWare flavor */
-#undef HAVE_UNIXWARE_SIGWAIT
-
 /** define if sysconf() is available */
 #undef HAVE_SYSCONF
 

diff --git a/lib/isc/unix/app.c b/lib/isc/unix/app.c
index a02311f7fcd81d4d7e5e1ce1d532ccebc174fa9f..eb742ff030f1c97f11eff60a558df71efc91d834 100644 (file)
--- a/lib/isc/unix/app.c
+++ b/lib/isc/unix/app.c
@@ -423,7 +423,6 @@ isc__app_ctxrun(isc_appctx_t *ctx0) {
                                return (ISC_R_UNEXPECTED);
                        }
 
-#ifndef HAVE_UNIXWARE_SIGWAIT
                        result = sigwait(&sset, &sig);
                        if (result == 0) {
                                if (sig == SIGINT || sig == SIGTERM)
@@ -432,15 +431,6 @@ isc__app_ctxrun(isc_appctx_t *ctx0) {
                                        ctx->want_reload = true;
                        }
 
-#else /* Using UnixWare sigwait semantics. */
-                       sig = sigwait(&sset);
-                       if (sig >= 0) {
-                               if (sig == SIGINT || sig == SIGTERM)
-                                       ctx->want_shutdown = true;
-                               else if (sig == SIGHUP)
-                                       ctx->want_reload = true;
-                       }
-#endif /* HAVE_UNIXWARE_SIGWAIT */
                } else {
                        /*
                         * External, or BIND9 using multiple contexts: