diff options
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/fileno.c | 8 | ||||
| -rw-r--r-- | libio/ftello.c | 7 | ||||
| -rw-r--r-- | libio/iofread.c | 3 | ||||
| -rw-r--r-- | libio/iofread_u.c | 5 |
4 files changed, 14 insertions, 9 deletions
diff --git a/libio/fileno.c b/libio/fileno.c index 92b0332c84..411ea0e052 100644 --- a/libio/fileno.c +++ b/libio/fileno.c @@ -28,7 +28,7 @@ #include <stdio.h> int -fileno (fp) +__fileno (fp) _IO_FILE* fp; { CHECK_FILE (fp, EOF); @@ -41,12 +41,14 @@ fileno (fp) return _IO_fileno (fp); } -libc_hidden_def (fileno) +libc_hidden_def (__fileno) +weak_alias (__fileno, fileno) +libc_hidden_weak (fileno) #ifdef weak_alias /* The fileno implementation for libio does not require locking because it only accesses once a single variable and this is already atomic (at least at thread level). Therefore we don't test _IO_MTSAFE_IO here. */ -weak_alias (fileno, fileno_unlocked) +weak_alias (__fileno, fileno_unlocked) #endif diff --git a/libio/ftello.c b/libio/ftello.c index 208ff8cfce..33a2160c18 100644 --- a/libio/ftello.c +++ b/libio/ftello.c @@ -31,7 +31,7 @@ off_t -ftello (fp) +__ftello (fp) _IO_FILE *fp; { _IO_off64_t pos; @@ -61,8 +61,9 @@ ftello (fp) } return pos; } -libc_hidden_def (ftello) +libc_hidden_def (__ftello) +weak_alias (__ftello, ftello) #ifdef __OFF_T_MATCHES_OFF64_T -weak_alias (ftello, ftello64) +weak_alias (__ftello, ftello64) #endif diff --git a/libio/iofread.c b/libio/iofread.c index ca792a20bd..a9d6282d6f 100644 --- a/libio/iofread.c +++ b/libio/iofread.c @@ -49,7 +49,8 @@ libc_hidden_def (_IO_fread) weak_alias (_IO_fread, fread) # ifndef _IO_MTSAFE_IO +strong_alias (_IO_fread, __fread_unlocked) +libc_hidden_def (__fread_unlocked) weak_alias (_IO_fread, fread_unlocked) -libc_hidden_ver (_IO_fread, fread_unlocked) # endif #endif diff --git a/libio/iofread_u.c b/libio/iofread_u.c index 5e462254a9..f0059b4bad 100644 --- a/libio/iofread_u.c +++ b/libio/iofread_u.c @@ -30,7 +30,7 @@ #undef fread_unlocked _IO_size_t -fread_unlocked (buf, size, count, fp) +__fread_unlocked (buf, size, count, fp) void *buf; _IO_size_t size; _IO_size_t count; @@ -44,4 +44,5 @@ fread_unlocked (buf, size, count, fp) bytes_read = _IO_sgetn (fp, (char *) buf, bytes_requested); return bytes_requested == bytes_read ? count : bytes_read / size; } -libc_hidden_def (fread_unlocked) +libc_hidden_def (__fread_unlocked) +weak_alias (__fread_unlocked, fread_unlocked) |