Merge branch 'release/debian/6.9.4-1'debian/6.9.4-1

1 files changed, 2 insertions, 16 deletions

diff --git a/test/testu.c b/test/testu.c
index 4b053e5..24397ab 100644
--- a/test/testu.c
+++ b/test/testu.c
@@ -116,28 +116,13 @@ static void xx(char* pattern, char* str, int from, int to, int mem, int not)
 
 #else
   regex_t* reg;
-  OnigCompileInfo ci;
   OnigErrorInfo einfo;
 
   uconv(pattern, cpat, ulen(pattern));
   uconv(str,     cstr, ulen(str));
 
-#if 0
   r = onig_new(&reg, (UChar* )pattern, (UChar* )(pattern + ulen(pattern)),
                ONIG_OPTION_DEFAULT, ENC, ONIG_SYNTAX_DEFAULT, &einfo);
-#else
-  ci.num_of_elements = 5;
-  ci.pattern_enc = ENC;
-  ci.target_enc  = ENC;
-  ci.syntax      = ONIG_SYNTAX_DEFAULT;
-  ci.option      = ONIG_OPTION_DEFAULT;
-  ci.case_fold_flag = ONIGENC_CASE_FOLD_DEFAULT;
-
-  r = onig_new_deluxe(&reg, (UChar* )pattern,
-          (UChar* )(pattern + ulen(pattern)),
-          &ci, &einfo);
-#endif
-
   if (r) {
     char s[ONIG_MAX_ERROR_MESSAGE_LEN];
     onig_error_code_to_str((UChar* )s, r, &einfo);
@@ -205,8 +190,9 @@ static void n(char* pattern, char* str)
 
 extern int main(int argc, char* argv[])
 {
-  static OnigEncoding use_encs[] = { ONIG_ENCODING_UTF16_BE };
+  OnigEncoding use_encs[1];
 
+  use_encs[0] = ONIG_ENCODING_UTF16_BE;
   onig_initialize(use_encs, sizeof(use_encs)/sizeof(use_encs[0]));
 
   err_file = stdout;