diff options
Diffstat (limited to 'devel/poco-devel/files/patch-pcre')
| -rw-r--r-- | devel/poco-devel/files/patch-pcre | 52 |
1 files changed, 10 insertions, 42 deletions
diff --git a/devel/poco-devel/files/patch-pcre b/devel/poco-devel/files/patch-pcre index e6edd9f34c89..052177238a16 100644 --- a/devel/poco-devel/files/patch-pcre +++ b/devel/poco-devel/files/patch-pcre @@ -1,43 +1,11 @@ -diff -ur Foundation/Makefile Foundation/Makefile ---- Foundation/Makefile 2014-04-02 01:13:57.000000000 -0700 -+++ Foundation/Makefile 2014-04-08 07:38:07.000000000 -0700 -@@ -44,6 +44,7 @@ +--- Foundation/include/Poco/RegularExpression.h.orig 2014-10-17 13:48:55.000000000 -0700 ++++ Foundation/include/Poco/RegularExpression.h 2014-10-17 13:49:30.000000000 -0700 +@@ -34,7 +34,7 @@ + extern "C" + { + struct real_pcre8_or_16; /* declaration; the definition is private */ +- typedef struct real_pcre8_or_16 pcre; ++ typedef struct real_pcre pcre; + struct pcre_extra; + } - ifdef POCO_UNBUNDLED - SYSLIBS += -lpcre -lz -+ objects += $(pcre_utf8_objects) # unicode.cpp uses internal pcre tables - else - objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects) - endif -diff -ur Foundation/src/pcre_internal.h Foundation/src/pcre_internal.h ---- Foundation/src/pcre_internal.h 2014-04-02 01:13:57.000000000 -0700 -+++ Foundation/src/pcre_internal.h 2014-04-08 07:38:07.000000000 -0700 -@@ -1109,6 +1109,16 @@ - } ucp_type_table; - - -+/* renamed to avoid clashes with system pcre */ -+#define _pcre_utf8_table1 _poco__pcre_utf8_table1 -+#define _pcre_utf8_table1_size _poco__pcre_utf8_table1_size -+#define _pcre_utf8_table2 _poco__pcre_utf8_table2 -+#define _pcre_utf8_table3 _poco__pcre_utf8_table3 -+#define _pcre_utf8_table4 _poco__pcre_utf8_table4 -+#define _pcre_utt _poco__pcre_utt -+#define _pcre_utt_size _poco__pcre_utt_size -+#define _pcre_utt_names _poco__pcre_utt_names -+#define _pcre_OP_lengths _poco__pcre_OP_lengths - /* Internal shared data tables. These are tables that are used by more than one - of the exported public functions. They have to be "external" in the C sense, - but are not part of the PCRE public API. The data for these tables is in the -@@ -1153,6 +1163,11 @@ - pcre_int32 other_case; - } ucd_record; - -+/* renamed to avoid clashes with system pcre */ -+#define _pcre_ucd_records _poco__pcre_ucd_records -+#define _pcre_ucd_stage1 _poco__pcre_ucd_stage1 -+#define _pcre_ucd_stage2 _poco__pcre_ucd_stage2 -+#define _pcre_ucp_gentype _poco__pcre_ucp_gentype - extern const ucd_record _pcre_ucd_records[]; - extern const uschar _pcre_ucd_stage1[]; - extern const pcre_uint16 _pcre_ucd_stage2[]; |