[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/kjs
From:       Leo Savernik <l.savernik () aon ! at>
Date:       2007-04-04 15:38:38
Message-ID: 1175701118.274081.8128.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 650442 by savernik:

Support libpcre without utf8-support.


 M  +7 -1      regexp.cpp  


--- branches/KDE/3.5/kdelibs/kjs/regexp.cpp #650441:650442
@@ -138,8 +138,10 @@
   if (flgs & Multiline)
     pcreflags |= PCRE_MULTILINE;
 
+#ifdef PCRE_CONFIG_UTF8
   if (utf8Support == Supported)
     pcreflags |= (PCRE_UTF8 | PCRE_NO_UTF8_CHECK);
+#endif
 
   // Fill our buffer with an encoded version, whether utf-8, or, 
   // if PCRE is incapable, truncated.
@@ -329,7 +331,11 @@
     nextPos  = i + 1;
   }
 
-  int baseFlags = utf8Support == Supported ? PCRE_NO_UTF8_CHECK : 0;
+  int baseFlags =
+#ifdef PCRE_CONFIG_UTF8
+    utf8Support == Supported ? PCRE_NO_UTF8_CHECK :
+#endif
+    0;
   if (pcre_exec(pcregex, NULL, buffer, bufferSize, startPos,
                 m_notEmpty ? (PCRE_NOTEMPTY | PCRE_ANCHORED | baseFlags) : \
baseFlags, // see man pcretest  ovector ? *ovector : 0L, ovecsize) == \
PCRE_ERROR_NOMATCH)


[prev in list] [next in list] [prev in thread] [next in thread]