svn commit: trunk/uClibc/libc: misc/regex stdlib

psm at uclibc.org psm at uclibc.org
Fri Dec 16 12:35:46 UTC 2005


Author: psm
Date: 2005-12-16 04:35:43 -0800 (Fri, 16 Dec 2005)
New Revision: 12930

Log:
Macros are no good for jump relocs, hack to get rid of one introduced my new regex code

Modified:
   trunk/uClibc/libc/misc/regex/regcomp.c
   trunk/uClibc/libc/stdlib/stdlib.c


Changeset:
Modified: trunk/uClibc/libc/misc/regex/regcomp.c
===================================================================
--- trunk/uClibc/libc/misc/regex/regcomp.c	2005-12-16 12:11:09 UTC (rev 12929)
+++ trunk/uClibc/libc/misc/regex/regcomp.c	2005-12-16 12:35:43 UTC (rev 12930)
@@ -834,6 +834,9 @@
   dfa->state_hash_mask = table_size - 1;
 
 #ifdef __UCLIBC_HAS_WCHAR__
+# undef MB_CUR_MAX
+# define	MB_CUR_MAX	(_stdlib_mb_cur_max_internal ())
+extern size_t _stdlib_mb_cur_max_internal (void) __THROW __wur attribute_hidden;
   dfa->mb_cur_max = MB_CUR_MAX;
 #else
   dfa->mb_cur_max = 1;

Modified: trunk/uClibc/libc/stdlib/stdlib.c
===================================================================
--- trunk/uClibc/libc/stdlib/stdlib.c	2005-12-16 12:11:09 UTC (rev 12929)
+++ trunk/uClibc/libc/stdlib/stdlib.c	2005-12-16 12:35:43 UTC (rev 12930)
@@ -868,7 +868,7 @@
 /**********************************************************************/
 #ifdef L__stdlib_mb_cur_max
 
-size_t _stdlib_mb_cur_max(void)
+size_t attribute_hidden _stdlib_mb_cur_max_internal(void)
 {
 #ifdef __CTYPE_HAS_UTF_8_LOCALES
 	return __UCLIBC_CURLOCALE_DATA.mb_cur_max;
@@ -881,6 +881,7 @@
 	return 1;
 #endif
 }
+strong_alias(_stdlib_mb_cur_max_internal,_stdlib_mb_cur_max)
 
 #endif
 /**********************************************************************/




More information about the uClibc-cvs mailing list