2f154b4f8c
a patch from Gentoo. While there clean up Makefile a bit (mixed whitespace format ugliness) and simplify a patch (just use upstream's existing sysconf code, rather than workaround the unportable use of sysctlbyname).
38 lines
1.6 KiB
Plaintext
38 lines
1.6 KiB
Plaintext
$OpenBSD: patch-Foundation_src_pcre_internal_h,v 1.1 2013/03/19 23:13:50 sthen Exp $
|
|
|
|
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/poco/files/poco-1.4.4-patch-for-libpcre-8.32.patch
|
|
|
|
--- Foundation/src/pcre_internal.h.orig Thu Dec 16 05:43:25 2010
|
|
+++ Foundation/src/pcre_internal.h Tue Mar 19 22:19:37 2013
|
|
@@ -1109,6 +1109,17 @@ typedef struct {
|
|
} 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
|
|
@@ -1152,6 +1163,12 @@ typedef struct {
|
|
uschar chartype;
|
|
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[];
|