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

diff --git a/libc/misc/regex/regcomp.c b/libc/misc/regex/regcomp.c
index 83df611..9d6c78c 100644 (file)
--- a/libc/misc/regex/regcomp.c
+++ b/libc/misc/regex/regcomp.c
@@ -833,7 +833,11 @@ init_dfa (re_dfa_t *dfa, size_t pat_len)
   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)

diff --git a/libc/misc/regex/regex_internal.h b/libc/misc/regex/regex_internal.h
index 14d14da..4782883 100644 (file)
--- a/libc/misc/regex/regex_internal.h
+++ b/libc/misc/regex/regex_internal.h
@@ -670,7 +670,9 @@ typedef struct
   {
     unsigned char ch;
     unsigned char *name;
+#ifdef __UCLIBC_HAS_WCHAR__
     wchar_t wch;
+#endif
   } opr;
 } bracket_elem_t;