Skip to content

Commit

Permalink
Rename pcre internal symbols used by Poco to avoid symbol collision
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas-Barbier-1A committed Feb 12, 2020
1 parent e5d6286 commit 7424c0a
Showing 1 changed file with 20 additions and 0 deletions.
20 changes: 20 additions & 0 deletions Foundation/src/pcre_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -2652,6 +2652,18 @@ typedef struct {
pcre_uint16 value;
} ucp_type_table;

#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
#define _pcre_ucp_gbtable _poco__pcre_ucp_gbtable
#define _pcre_vspace_list _poco__pcre_vspace_list
#define _pcre_hspace_list _poco__pcre_hspace_list

/* 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,
Expand Down Expand Up @@ -2766,6 +2778,14 @@ typedef struct {
pcre_int32 other_case; /* offset to other case, or zero if none */
} 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
#define _pcre_ucd_caseless_sets _poco__pcre_ucd_caseless_sets

extern const pcre_uint32 PRIV(ucd_caseless_sets)[];
extern const ucd_record PRIV(ucd_records)[];
extern const pcre_uint8 PRIV(ucd_stage1)[];
Expand Down

0 comments on commit 7424c0a

Please sign in to comment.