Revert change 966. Brian says user-level programs should not include

any headers under asm.

diff --git a/CHANGES b/CHANGES
index 9db0916486a589ae60f9f476e2efaa580313d3fc..9a552705dc24de8e32ee016a42015b78161cb4f6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,8 +6,7 @@
                        to interpret the error messages in the event log,
                        [RT #1668]
 
- 966.  [port]          #include <asm/unistd.h> is required on some Linux
-                       ports.  [RT #1670]
+ 966.  [placeholder]
 
  965.  [bug]           Including data other than root server NS and A
                        records in the root hint file could cause a rbtdb

diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c
index 00aa8135f017e6866b5e4e4287a31f3874b5f851..da1874f5e26b79637dee1cef9cbf96cdf1231cf2 100644 (file)
--- a/bin/named/unix/os.c
+++ b/bin/named/unix/os.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.c,v 1.45 2001/08/29 04:21:51 marka Exp $ */
+/* $Id: os.c,v 1.46 2001/08/29 18:03:36 gson Exp $ */
 
 #include <config.h>
 #include <stdarg.h>
@@ -107,7 +107,6 @@ static isc_boolean_t non_root_caps = ISC_FALSE;
  */
 #define _LINUX_FS_H
 
-#include <asm/unistd.h>
 #include <sys/syscall.h>       /* Required for syscall(). */
 #include <linux/capability.h>  /* Required for _LINUX_CAPABILITY_VERSION. */