about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--include/unistd.h1
-rw-r--r--nptl/pthread_setcancelstate.c2
-rw-r--r--nptl/pthread_setcanceltype.c2
4 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e5457609bf..e8e14deb3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-08  Ulrich Drepper  <drepper@redhat.com>
+
+	* include/unistd.h: Declare __libc_close.
+
 2002-12-07  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/generic/bits/stdio-lock.h (_IO_lock_trylock): New define.
diff --git a/include/unistd.h b/include/unistd.h
index 21d248e1af..ab6fd671de 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -117,6 +117,7 @@ extern int __getdtablesize (void);
 extern int __brk (void *__addr);
 extern int __close (int __fd);
 libc_hidden_proto (__close)
+extern int __libc_close (int __fd);
 extern ssize_t __read (int __fd, void *__buf, size_t __nbytes);
 libc_hidden_proto (__read)
 extern ssize_t __write (int __fd, __const void *__buf, size_t __n);
diff --git a/nptl/pthread_setcancelstate.c b/nptl/pthread_setcancelstate.c
index 3f36df8cd6..ad50d1ce75 100644
--- a/nptl/pthread_setcancelstate.c
+++ b/nptl/pthread_setcancelstate.c
@@ -47,7 +47,7 @@ pthread_setcancelstate (state, oldstate)
 		     ? PTHREAD_CANCEL_DISABLE : PTHREAD_CANCEL_ENABLE);
 
       /* Avoid doing unnecessary work.  The atomic operation can
-	 potentially be expensive if the bug has to be locked and
+	 potentially be expensive if the memory has to be locked and
 	 remote cache lines have to be invalidated.  */
       if (oldval == newval)
 	break;
diff --git a/nptl/pthread_setcanceltype.c b/nptl/pthread_setcanceltype.c
index 63867d301b..be0056a4e0 100644
--- a/nptl/pthread_setcanceltype.c
+++ b/nptl/pthread_setcanceltype.c
@@ -47,7 +47,7 @@ __pthread_setcanceltype (type, oldtype)
 		    ? PTHREAD_CANCEL_ASYNCHRONOUS : PTHREAD_CANCEL_DEFERRED);
 
       /* Avoid doing unnecessary work.  The atomic operation can
-	 potentially be expensive if the bug has to be locked and
+	 potentially be expensive if the memory has to be locked and
 	 remote cache lines have to be invalidated.  */
       if (oldval == newval)
 	break;