Update.

	* libio/libioP.h (_IO_acquire_lock_fct): Define as inline function.

diff --git a/ChangeLog b/ChangeLog
index 05a6dcad6cdd6cc39f0b7965d8adc8a92d9ac6e6..939f9f1203038401b798a49d47ca33814d19443b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,7 @@
 
 2003-08-31  Ulrich Drepper  <drepper@redhat.com>
 
-       * libio/libio.h (_IO_acquire_lock_fct): Define as inline function.
+       * libio/libioP.h (_IO_acquire_lock_fct): Define as inline function.
        Code by Richard Henderson.
 
 2003-08-31  Philip Blundell  <philb@gnu.org>

diff --git a/libio/libio.h b/libio/libio.h
index af747933690dddc774dc9904c6b32d2b0e6241aa..11274aebb4aa3fe30c698b4d8db968a679410f3f 100644 (file)
--- a/libio/libio.h
+++ b/libio/libio.h
@@ -516,14 +516,6 @@ extern _IO_ssize_t _IO_wpadn (_IO_FILE *, wint_t, _IO_ssize_t) __THROW;
 extern void _IO_free_wbackup_area (_IO_FILE *) __THROW;
 #endif
 
-static inline void
-_IO_acquire_lock_fct (_IO_FILE **p)
-{
-  _IO_FILE *fp = *p;
-  if ((fp->_flags & _IO_USER_LOCK) == 0)
-    _IO_funlockfile (fp);
-}
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/libio/libioP.h b/libio/libioP.h
index 1d30eef5cd7f0f06b776f845aa2e5755b150edf8..1e66feaa788b53da600ce30ad850e61d1c526789 100644 (file)
--- a/libio/libioP.h
+++ b/libio/libioP.h
@@ -970,3 +970,12 @@ extern struct _IO_fake_stdiobuf _IO_stdin_buf, _IO_stdout_buf, _IO_stderr_buf;
 #else
 # define CHECK_FILE(FILE, RET) COERCE_FILE (FILE)
 #endif
+
+static inline void
+__attribute__ ((__always_inline__))
+_IO_acquire_lock_fct (_IO_FILE **p)
+{
+  _IO_FILE *fp = *p;
+  if ((fp->_flags & _IO_USER_LOCK) == 0)
+    _IO_funlockfile (fp);
+}

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 6d04d991077f8d61063500e7f3a8c4937014bc3c..2bf051082dc419a4e5fdbcf9cdbb46bf5093828c 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,9 @@
 2003-08-31  Ulrich Drepper  <drepper@redhat.com>
 
+       * sysdeps/pthread/bits/stdio-lock.h (_IO_acquire_lock): Avoid
+       nested function, use static inline function from libio.h.
+       Code by Richard Henderson.
+
        * sysdeps/pthread/bits/libc-lock.h: Mark pthread_setcancelstate as
        weak.