summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--hurd/hurd/fd.h5
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4e22140f97..d26e3d6aa4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-08  Mark Kettenis  <kettenis@gnu.org>
+
+	* hurd/hurd/fd.h: Include <cthreads.h> instead of <lock-intern.h>.
+
 2000-07-07  Greg McGary  <greg@mcgary.org>
 
 	* sysdeps/unix/make-syscalls.sh: Tolerate syscalls that
diff --git a/hurd/hurd/fd.h b/hurd/hurd/fd.h
index 711d15e4ab..7247fb9f31 100644
--- a/hurd/hurd/fd.h
+++ b/hurd/hurd/fd.h
@@ -1,5 +1,5 @@
 /* File descriptors.
-   Copyright (C) 1993,94,95,96,97,98, 99 Free Software Foundation, Inc.
+   Copyright (C) 1993,94,95,96,97,98,99,2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -22,6 +22,8 @@
 #define	_HURD_FD_H	1
 #include <features.h>
 
+#include <cthreads.h>
+
 #include <hurd/hurd_types.h>
 #include <hurd/port.h>
 
@@ -47,7 +49,6 @@ extern struct hurd_fd **_hurd_dtable;
 extern struct mutex _hurd_dtable_lock; /* Locks those two variables.  */
 
 #include <hurd/signal.h>
-#include <lock-intern.h>
 
 #ifndef _HURD_FD_H_EXTERN_INLINE
 #define _HURD_FD_H_EXTERN_INLINE extern __inline