From 821e7539de6922c96e2a4fc5baa11fdc335072c9 Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Tue, 6 Dec 2005 03:45:53 +0000 Subject: More merging from trunk. --- libc/stdio/__fsetlocking.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libc/stdio/__fsetlocking.c') diff --git a/libc/stdio/__fsetlocking.c b/libc/stdio/__fsetlocking.c index 77690e269..5b6070cc3 100644 --- a/libc/stdio/__fsetlocking.c +++ b/libc/stdio/__fsetlocking.c @@ -15,7 +15,7 @@ * glibc treats invalid locking_mode args as FSETLOCKING_INTERNAL. */ -int attribute_hidden __libc_fsetlocking(FILE *stream, int locking_mode) +int attribute_hidden __fsetlocking_internal(FILE *stream, int locking_mode) { #ifdef __UCLIBC_HAS_THREADS__ int current = 1 + (stream->__user_locking & 1); @@ -44,4 +44,4 @@ int attribute_hidden __libc_fsetlocking(FILE *stream, int locking_mode) #endif } -strong_alias(__libc_fsetlocking,__fsetlocking) +strong_alias(__fsetlocking_internal,__fsetlocking) -- cgit v1.2.3