From a920808b219ce74ae7e5e3f52bcbfe67884c5087 Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Thu, 8 Dec 2005 04:51:28 +0000 Subject: Merge from trunk. --- libc/misc/regex/regex.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'libc/misc/regex/regex.c') diff --git a/libc/misc/regex/regex.c b/libc/misc/regex/regex.c index bf8958a66..5220ba57c 100644 --- a/libc/misc/regex/regex.c +++ b/libc/misc/regex/regex.c @@ -32,9 +32,18 @@ #include #ifdef __UCLIBC_HAS_WCHAR__ #define RE_ENABLE_I18N +#define wcscoll __wcscoll +#define wcrtomb __wcrtomb +#define mbrtowc __mbrtowc +#define iswctype __iswctype +#define iswlower __iswlower +#define iswalnum __iswalnum #include #include +/* attribute_hidden produces text relocation */ +//extern int __wcscoll (__const wchar_t *__s1, __const wchar_t *__s2) __THROW /*attribute_hidden*/; + extern size_t __wcrtomb (char *__restrict __s, wchar_t __wc, mbstate_t *__restrict __ps) attribute_hidden; @@ -42,7 +51,7 @@ extern wint_t __btowc (int __c) attribute_hidden; extern wctype_t __wctype (__const char *__property) attribute_hidden; -extern int __iswctype (wint_t __wc, wctype_t __desc) /*attribute_hidden*/; +//extern int __iswctype (wint_t __wc, wctype_t __desc) /*attribute_hidden*/; #endif #define memcmp __memcmp @@ -54,9 +63,10 @@ extern int __iswctype (wint_t __wc, wctype_t __desc) /*attribute_hidden*/; #define strlen __strlen #define strncpy __strncpy #define getenv __getenv +#define strcasecmp __strcasecmp extern void *__mempcpy (void *__restrict __dest, - __const void *__restrict __src, size_t __n) /*attribute_hidden*/; + __const void *__restrict __src, size_t __n) attribute_hidden; #endif /* Make sure noone compiles this code with a C++ compiler. */ -- cgit v1.2.3