summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-05-28 23:19:53 +0000
committerRoland McGrath <roland@gnu.org>2002-05-28 23:19:53 +0000
commitc634de6db6790f6b01c0c00ff272a0f9a1b34a22 (patch)
tree763b8e0d18fcbc96f335a1a40fbc86f04ded4485
parente7000d0f05cd339abb8d2caf1cd20a11e2fd2284 (diff)
2002-05-28 Roland McGrath <roland@frob.com>
* lockfile.c: Use __attribute__ magic instead of #pragma magic for alias definitions. Don't bother to make them weak.
-rw-r--r--libthreads/lockfile.c23
1 files changed, 14 insertions, 9 deletions
diff --git a/libthreads/lockfile.c b/libthreads/lockfile.c
index 2fe9800b..eeb1a2f3 100644
--- a/libthreads/lockfile.c
+++ b/libthreads/lockfile.c
@@ -1,5 +1,5 @@
/* lockfile - Handle locking and unlocking of streams. Hurd cthreads version.
- Copyright (C) 2000,01 Free Software Foundation, Inc.
+ Copyright (C) 2000,01,02 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
@@ -41,20 +41,25 @@ _cthreads_ftrylockfile (_IO_FILE *fp)
return __libc_lock_trylock_recursive (*fp->_lock);
}
-
# undef _IO_flockfile
# undef _IO_funlockfile
# undef _IO_ftrylockfile
-# pragma weak _IO_flockfile = _cthreads_flockfile
-# pragma weak _IO_funlockfile = _cthreads_funlockfile
-# pragma weak _IO_ftrylockfile= _cthreads_ftrylockfile
-
# undef flockfile
# undef funlockfile
# undef ftrylockfile
-# pragma weak flockfile = _cthreads_flockfile
-# pragma weak funlockfile = _cthreads_funlockfile
-# pragma weak ftrylockfile = _cthreads_ftrylockfile
+void _IO_flockfile (_IO_FILE *)
+ __attribute__ ((alias ("_cthreads_flockfile")));
+void _IO_funlockfile (_IO_FILE *)
+ __attribute__ ((alias ("_cthreads_funlockfile")));
+int _IO_ftrylockfile (_IO_FILE *)
+ __attribute__ ((alias ("_cthreads_ftrylockfile")));
+
+void flockfile (_IO_FILE *)
+ __attribute__ ((alias ("_cthreads_flockfile")));
+void funlockfile (_IO_FILE *)
+ __attribute__ ((alias ("_cthreads_funlockfile")));
+int ftrylockfile (_IO_FILE *)
+ __attribute__ ((alias ("_cthreads_ftrylockfile")));
#endif /* _STDIO_USES_IOSTREAM */