Module Name: src
Committed By: mrg
Date: Sat Nov 6 21:32:49 UTC 2010
Modified Files:
src/external/bsd/bind: Makefile.inc
src/external/bsd/bind/include/isc: platform.h
Log Message:
fix NAMED_USE_PTHREADS != yes usage.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/include/isc/platform.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.5 src/external/bsd/bind/Makefile.inc:1.6
--- src/external/bsd/bind/Makefile.inc:1.5 Fri Aug 6 10:58:03 2010
+++ src/external/bsd/bind/Makefile.inc Sat Nov 6 21:32:49 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2010/08/06 10:58:03 christos Exp $
+# $NetBSD: Makefile.inc,v 1.6 2010/11/06 21:32:49 mrg Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -74,6 +74,7 @@
.if ${NAMED_USE_PTHREADS} == "yes"
# XXX: Not ready yet
# CPPFLAGS+= -DISC_PLATFORM_USE_NATIVE_RWLOCKS
+CPPFLAGS+= -DISC_PLATFORM_USETHREADS
.if !defined (LIB) || empty(LIB)
LDADD+= -lpthread
DPADD+= ${LIBPTHREAD}
Index: src/external/bsd/bind/include/isc/platform.h
diff -u src/external/bsd/bind/include/isc/platform.h:1.5 src/external/bsd/bind/include/isc/platform.h:1.6
--- src/external/bsd/bind/include/isc/platform.h:1.5 Fri Aug 6 10:58:13 2010
+++ src/external/bsd/bind/include/isc/platform.h Sat Nov 6 21:32:49 2010
@@ -207,7 +207,8 @@
/*
* Defined if we are using threads.
*/
-#define ISC_PLATFORM_USETHREADS 1
+/* Put in the Makefile */
+/* #define ISC_PLATFORM_USETHREADS 1 */
/*
* Defined if unistd.h does not cause fd_set to be delared.
