Module Name:    src
Committed By:   msaitoh
Date:           Wed Dec 31 06:17:24 UTC 2014

Modified Files:
        src/external/bsd/bind/include/isc [netbsd-6-1]: platform.h

Log Message:
Pullup additional patches requested by spz in ticket #1217:

external/bsd/bind/include/isc/platform.h        patch

        Fix some definitions to match -current to fix compile error on
        many archs.


To generate a diff of this commit:
cvs rdiff -u -r1.12.4.1.6.1 -r1.12.4.1.6.2 \
    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/include/isc/platform.h
diff -u src/external/bsd/bind/include/isc/platform.h:1.12.4.1.6.1 src/external/bsd/bind/include/isc/platform.h:1.12.4.1.6.2
--- src/external/bsd/bind/include/isc/platform.h:1.12.4.1.6.1	Fri Dec 26 03:08:43 2014
+++ src/external/bsd/bind/include/isc/platform.h	Wed Dec 31 06:17:24 2014
@@ -20,6 +20,8 @@
 #ifndef ISC_PLATFORM_H
 #define ISC_PLATFORM_H 1
 
+#include <sys/atomic.h>
+
 /*! \file */
 
 /*****
@@ -208,10 +210,12 @@
  *** Miscellaneous.
  ***/
 
+#if 0 /* use define in Makefile instead */
 /*
  * Defined if we are using threads.
  */
 #define ISC_PLATFORM_USETHREADS 1
+#endif
 
 /*
  * Defined if unistd.h does not cause fd_set to be delared.
@@ -266,13 +270,17 @@
  * If the "xadd" operation is available on this architecture,
  * ISC_PLATFORM_HAVEXADD will be defined.
  */
+#ifdef __HAVE_ATOMIC64_OPS
 #define ISC_PLATFORM_HAVEXADD 1
+#endif
 
 /*
  * If the "xaddq" operation (64bit xadd) is available on this architecture,
  * ISC_PLATFORM_HAVEXADDQ will be defined.
  */
+#ifdef __HAVE_ATOMIC64_OPS
 #define ISC_PLATFORM_HAVEXADDQ 1
+#endif
 
 /*
  * If the "atomic swap" operation is available on this architecture,

Reply via email to