All the remaining changes for handling characters with more than one other

case.


git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1046 2f5784b3-3f2a-0410-8824-cb99058d5e15

1 files changed, 21 insertions, 1 deletions

diff --git a/pcre_ucd.c b/pcre_ucd.c
index eee39b9..6b0ec35 100644
--- a/pcre_ucd.c
+++ b/pcre_ucd.c
@@ -1,9 +1,23 @@
+/* This module is generated by the maint/MultiStage2.py script.
+Do not modify it by hand. Instead modify the script and run it
+to regenerate this code.
+
+As well as being part of the PCRE library, this module is #included
+by the pcretest program, which redefines the PRIV macro to change
+table names from _pcre_xxx to xxxx, thereby avoiding name clashes
+with the library. At present, just one of these tables is actually
+needed. */
+
+#ifndef PCRE_INCLUDED
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "pcre_internal.h"
 
+#endif /* PCRE_INCLUDED */
+
 /* Unicode character database. */
 /* This file was autogenerated by the MultiStage2.py script. */
 /* Total size: 65688 bytes, block size: 128. */
@@ -18,7 +32,7 @@ a totally empty module because some compilers barf at that.
 Instead, just supply small dummy tables. */
 
 #ifndef SUPPORT_UCP
-const ucd_record PRIV(ucd_records)[] = {{0,0,0,0 }};
+const ucd_record PRIV(ucd_records)[] = {{0,0,0,0,0 }};
 const pcre_uint8 PRIV(ucd_stage1)[] = {0};
 const pcre_uint16 PRIV(ucd_stage2)[] = {0};
 const pcre_uint32 PRIV(ucd_caseless_sets)[] = {0};
@@ -61,6 +75,10 @@ const pcre_uint32 PRIV(ucd_caseless_sets)[] = {
   0x00c5,   0x00e5,   0x212b,   NOTACHAR,
 };
 
+/* When #included in pcretest, we don't need this large table. */
+
+#ifndef PCRE_INCLUDED
+
 const ucd_record PRIV(ucd_records)[] = { /* 5016 bytes, record size 8 */
   {     9,      0,      2,      0,      0, }, /*   0 */
   {     9,      0,      1,      0,      0, }, /*   1 */
@@ -3275,3 +3293,5 @@ const pcre_uint16 PRIV(ucd_stage2)[] = { /* 51968 bytes, block = 128 */
 #error Please correct UCD_BLOCK_SIZE in pcre_internal.h
 #endif
 #endif  /* SUPPORT_UCP */
+
+#endif  /* PCRE_INCLUDED */