From 43123f2ccc714bbb4991b538dd70e411899f98e3 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Tue, 3 Jan 2006 17:17:14 +0000 Subject: Get rid of tolower/toupper jump reloc, correct tow* for XLOCALE --- libc/misc/wctype/wctype.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'libc/misc/wctype') diff --git a/libc/misc/wctype/wctype.c b/libc/misc/wctype/wctype.c index 67b1ca600..659000558 100644 --- a/libc/misc/wctype/wctype.c +++ b/libc/misc/wctype/wctype.c @@ -378,7 +378,9 @@ strong_alias(__towlower_l,towlower_l) #endif /* __LOCALE_C_ONLY */ +#ifndef L_towlower_l strong_alias(__towlower,towlower) +#endif #endif /**********************************************************************/ @@ -484,7 +486,9 @@ strong_alias(__towupper_l,towupper_l) #endif /* __LOCALE_C_ONLY */ +#ifndef L_towupper_l strong_alias(__towupper,towupper) +#endif #endif /**********************************************************************/ @@ -724,11 +728,11 @@ weak_alias(__iswctype, iswctype) #ifndef _tolower #warning _tolower is undefined! -#define _tolower(c) tolower(c) +#define _tolower(c) __tolower(c) #endif #ifndef _toupper #warning _toupper is undefined! -#define _toupper(c) toupper(c) +#define _toupper(c) __toupper(c) #endif wint_t attribute_hidden __towctrans(wint_t wc, wctrans_t desc) @@ -880,10 +884,13 @@ wint_t attribute_hidden TOWCTRANS(wint_t wc, wctrans_t desc) #ifdef L_towctrans_l strong_alias(__towctrans_l, towctrans_l) #endif /* L_towctrans_l */ -strong_alias(__towctrans,towctrans) #endif /* __LOCALE_C_ONLY */ +#ifndef L_towctrans_l +strong_alias(__towctrans,towctrans) +#endif + #endif /**********************************************************************/ #ifdef L_wctrans -- cgit v1.2.3