summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-12-16 22:17:11 +0000
committerUlrich Drepper <drepper@redhat.com>2002-12-16 22:17:11 +0000
commit0a1063f471355de723393cb968ac9324de1d185d (patch)
treee2d4885e0c194e8420d11ece77b154b743366962 /nptl
parent9634cf9d4f30861dbf3ee057a1219227d8c8f19d (diff)
downloadglibc-0a1063f471355de723393cb968ac9324de1d185d.tar.gz
glibc-0a1063f471355de723393cb968ac9324de1d185d.tar.xz
glibc-0a1063f471355de723393cb968ac9324de1d185d.zip
Update.
2002-12-16  Ulrich Drepper  <drepper@redhat.com>

	* stdio-common/Makefile (routines): Remove lockfile.  Add
	flockfile, ftrylockfile, and funlockfile.
	* sysdeps/generic/lockfile.c: Removed.  Each function has its own file.
	* sysdeps/generic/flockfile.c: New file.
	* sysdeps/generic/ftrylockfile.c: New file.
	* sysdeps/generic/funlockfile.c: New file.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog9
-rw-r--r--nptl/sysdeps/pthread/flockfile.c (renamed from nptl/flockfile.c)5
-rw-r--r--nptl/sysdeps/pthread/ftrylockfile.c (renamed from nptl/ftrylockfile.c)5
-rw-r--r--nptl/sysdeps/pthread/funlockfile.c (renamed from nptl/funlockfile.c)5
4 files changed, 18 insertions, 6 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 49c94ee3b3..e1e77223e2 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,12 @@
+2002-12-16  Ulrich Drepper  <drepper@redhat.com>
+
+	* flockfile.c: Moved to...
+	* sysdeps/pthread/flockfile.c: ...here.  New file.
+	* funlockfile.c: Moved to...
+	* sysdeps/pthread/funlockfile.c: ...here.  New file.
+	* ftrylockfile.c: Moved to...
+	* sysdeps/pthread/ftrylockfile.c: ...here.  New file.
+
 2002-12-16  Jakub Jelinek  <jakub@redhat.com>
 
 	* libc-cancellation.c: Guard both function with
diff --git a/nptl/flockfile.c b/nptl/sysdeps/pthread/flockfile.c
index db6776813c..a90215cc1f 100644
--- a/nptl/flockfile.c
+++ b/nptl/sysdeps/pthread/flockfile.c
@@ -24,9 +24,10 @@
 
 
 void
-flockfile (stream)
+__flockfile (stream)
      FILE *stream;
 {
   _IO_lock_lock (*stream->_lock);
 }
-strong_alias (flockfile, _IO_flockfile)
+strong_alias (__flockfile, _IO_flockfile)
+strong_alias (__flockfile, flockfile)
diff --git a/nptl/ftrylockfile.c b/nptl/sysdeps/pthread/ftrylockfile.c
index 2266b251b4..21c1ea01ed 100644
--- a/nptl/ftrylockfile.c
+++ b/nptl/sysdeps/pthread/ftrylockfile.c
@@ -24,9 +24,10 @@
 
 
 int
-ftrylockfile (stream)
+__ftrylockfile (stream)
      FILE *stream;
 {
   return _IO_lock_trylock (*stream->_lock);
 }
-strong_alias (ftrylockfile, _IO_ftrylockfile)
+strong_alias (__ftrylockfile, _IO_ftrylockfile)
+weak_alias (__ftrylockfile, ftrylockfile)
diff --git a/nptl/funlockfile.c b/nptl/sysdeps/pthread/funlockfile.c
index f0314b2fc6..f941fc9851 100644
--- a/nptl/funlockfile.c
+++ b/nptl/sysdeps/pthread/funlockfile.c
@@ -24,9 +24,10 @@
 
 
 void
-funlockfile (stream)
+__funlockfile (stream)
      FILE *stream;
 {
   _IO_lock_unlock (*stream->_lock);
 }
-strong_alias (funlockfile, _IO_funlockfile)
+strong_alias (__funlockfile, _IO_funlockfile)
+weak_alias (__funlockfile, funlockfile)