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

[psm at uclibc.org]

Author: psm
Date: 2005-12-16 03:54:26 -0800 (Fri, 16 Dec 2005)
New Revision: 12928

Log:
Make new regex build w/ WCHAR disabled, vapier, does it now work for you?

Modified:
   trunk/uClibc/libc/misc/regex/regcomp.c
   trunk/uClibc/libc/misc/regex/regex_internal.h


Changeset:
Modified: trunk/uClibc/libc/misc/regex/regcomp.c
===================================================================
--- trunk/uClibc/libc/misc/regex/regcomp.c	2005-12-16 11:06:08 UTC (rev 12927)
+++ trunk/uClibc/libc/misc/regex/regcomp.c	2005-12-16 11:54:26 UTC (rev 12928)
@@ -833,7 +833,11 @@
   dfa->state_table = calloc (sizeof (struct re_state_table_entry), table_size);
   dfa->state_hash_mask = table_size - 1;
 
+#ifdef __UCLIBC_HAS_WCHAR__
   dfa->mb_cur_max = MB_CUR_MAX;
+#else
+  dfa->mb_cur_max = 1;
+#endif
 #ifdef _LIBC
   if (dfa->mb_cur_max == 6
       && strcmp (_NL_CURRENT (LC_CTYPE, _NL_CTYPE_CODESET_NAME), "UTF-8") == 0)

Modified: trunk/uClibc/libc/misc/regex/regex_internal.h
===================================================================
--- trunk/uClibc/libc/misc/regex/regex_internal.h	2005-12-16 11:06:08 UTC (rev 12927)
+++ trunk/uClibc/libc/misc/regex/regex_internal.h	2005-12-16 11:54:26 UTC (rev 12928)
@@ -670,7 +670,9 @@
   {
     unsigned char ch;
     unsigned char *name;
+#ifdef __UCLIBC_HAS_WCHAR__
     wchar_t wch;
+#endif
   } opr;
 } bracket_elem_t;