diff -Naurp bind-9.10.0-P1/lib/isc/unix/socket.c bind-9.10.0-P1.oden/lib/isc/unix/socket.c --- bind-9.10.0-P1/lib/isc/unix/socket.c 2014-05-05 02:15:51.000000000 +0200 +++ bind-9.10.0-P1.oden/lib/isc/unix/socket.c 2014-05-09 08:35:41.000000000 +0200 @@ -66,6 +66,20 @@ #include <isc/util.h> #include <isc/xml.h> +/* See task.c about the following definition: */ +#ifdef BIND9 +#ifdef ISC_PLATFORM_USETHREADS +#define USE_WATCHER_THREAD +#else +#define USE_SHARED_MANAGER +#endif /* ISC_PLATFORM_USETHREADS */ +#else /* BIND9 */ +#undef ISC_PLATFORM_HAVESYSUNH +#undef ISC_PLATFORM_HAVEKQUEUE +#undef ISC_PLATFORM_HAVEEPOLL +#undef ISC_PLATFORM_HAVEDEVPOLL +#endif /* BIND9 */ + #ifdef ISC_PLATFORM_HAVESYSUNH #include <sys/un.h> #endif @@ -85,13 +99,6 @@ #include "errno2result.h" -/* See task.c about the following definition: */ -#ifdef ISC_PLATFORM_USETHREADS -#define USE_WATCHER_THREAD -#else -#define USE_SHARED_MANAGER -#endif /* ISC_PLATFORM_USETHREADS */ - #ifndef USE_WATCHER_THREAD #include "socket_p.h" #include "../task_p.h"