[Pcre-svn] [1038] code/trunk: Fix JIT tests when UTF is disa…

Startseite
Nachricht löschen
Autor: Subversion repository
Datum:  
To: pcre-svn
Betreff: [Pcre-svn] [1038] code/trunk: Fix JIT tests when UTF is disabled and both 8 and 16 bit mode are enabled.
Revision: 1038
          http://vcs.pcre.org/viewvc?view=rev&revision=1038
Author:   zherczeg
Date:     2012-09-12 10:03:23 +0100 (Wed, 12 Sep 2012)


Log Message:
-----------
Fix JIT tests when UTF is disabled and both 8 and 16 bit mode are enabled.

Modified Paths:
--------------
    code/trunk/ChangeLog
    code/trunk/pcre_jit_test.c


Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog    2012-09-12 08:30:17 UTC (rev 1037)
+++ code/trunk/ChangeLog    2012-09-12 09:03:23 UTC (rev 1038)
@@ -74,6 +74,7 @@
 16. The new PCRE_STUDY_EXTRA_NEEDED option is now used by pcregrep, resulting 
     in a small tidy to the code.


+17. Fix JIT tests when UTF is disabled and both 8 and 16 bit mode are enabled.


Version 8.31 06-July-2012

Modified: code/trunk/pcre_jit_test.c
===================================================================
--- code/trunk/pcre_jit_test.c    2012-09-12 08:30:17 UTC (rev 1037)
+++ code/trunk/pcre_jit_test.c    2012-09-12 09:03:23 UTC (rev 1038)
@@ -1101,7 +1101,7 @@


         is_successful = 1;
         if (!(current->start_offset & F_DIFF)) {
-#if defined SUPPORT_PCRE8 && defined SUPPORT_PCRE16
+#if defined SUPPORT_PCRE8 && defined SUPPORT_PCRE16 && defined SUPPORT_UTF
             if (utf8 == utf16 && !(current->start_offset & F_FORCECONV)) {
                 /* All results must be the same. */
                 if (return_value8_1 != return_value8_2 || return_value8_1 != return_value16_1 || return_value8_1 != return_value16_2) {
@@ -1179,7 +1179,7 @@
                 }
 #endif


-#if defined SUPPORT_PCRE8 && defined SUPPORT_PCRE16
+#if defined SUPPORT_PCRE8 && defined SUPPORT_PCRE16 && defined SUPPORT_UTF
             }
 #endif /* SUPPORT_PCRE8 && SUPPORT_PCRE16 */
         }