Revision: 393
http://vcs.pcre.org/viewvc?view=rev&revision=393
Author: ph10
Date: 2009-03-17 21:47:54 +0000 (Tue, 17 Mar 2009)
Log Message:
-----------
Force SUPPORT_UTF8 if SUPPORT_UCP is set (for non-"configure" users).
Modified Paths:
--------------
code/trunk/ChangeLog
code/trunk/pcre_internal.h
Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog 2009-03-17 21:30:30 UTC (rev 392)
+++ code/trunk/ChangeLog 2009-03-17 21:47:54 UTC (rev 393)
@@ -63,6 +63,11 @@
17. Implemented support for UTF-8 encoding in EBCDIC environments, a patch
from Martin Jerabek that uses macro names for all relevant character and
string constants.
+
+18. Added to pcre_internal.h two configuration checks: (a) If both EBCDIC and
+ SUPPORT_UTF8 are set, give an error; (b) If SUPPORT_UCP is set without
+ SUPPORT_UTF8, define SUPPORT_UTF8. The "configure" script handles both of
+ these, but not everybody uses configure.
Version 7.8 05-Sep-08
Modified: code/trunk/pcre_internal.h
===================================================================
--- code/trunk/pcre_internal.h 2009-03-17 21:30:30 UTC (rev 392)
+++ code/trunk/pcre_internal.h 2009-03-17 21:47:54 UTC (rev 393)
@@ -58,6 +58,13 @@
#error The use of both EBCDIC and SUPPORT_UTF8 is not supported.
#endif
+/* If SUPPORT_UCP is defined, SUPPORT_UTF8 must also be defined. The
+"configure" script ensures this, but not everybody uses "configure". */
+
+#if defined SUPPORT_UCP && !defined SUPPORT_UTF8
+#define SUPPORT_UTF8 1
+#endif
+
/* Use a macro for debugging printing, 'cause that eliminates the use of #ifdef
inline, and there are *still* stupid compilers about that don't like indented
pre-processor statements, or at least there were when I first wrote this. After
