diff options
| author | Patrik Nyblom <[email protected]> | 2013-07-15 11:23:38 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2013-08-06 16:19:24 +0200 |
| commit | 7a0cc794dddd65ef825571056b71e3fca7f4f315 (patch) | |
| tree | 52752ea54b451a2ba6b183124c70b59f90ef048d /erts/emulator/pcre/pcre_exec.c | |
| parent | d0898734b7ae62572579a0ecd0b03ab451b233bb (diff) | |
| download | otp-7a0cc794dddd65ef825571056b71e3fca7f4f315.tar.gz otp-7a0cc794dddd65ef825571056b71e3fca7f4f315.tar.bz2 otp-7a0cc794dddd65ef825571056b71e3fca7f4f315.zip | |
Add erts_prefix to pcre_library and update erl_bif_re
Diffstat (limited to 'erts/emulator/pcre/pcre_exec.c')
| -rw-r--r-- | erts/emulator/pcre/pcre_exec.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/erts/emulator/pcre/pcre_exec.c b/erts/emulator/pcre/pcre_exec.c index 54c0fe59a1..0371f9efa8 100644 --- a/erts/emulator/pcre/pcre_exec.c +++ b/erts/emulator/pcre/pcre_exec.c @@ -6681,10 +6681,17 @@ typedef struct { #if defined COMPILE_PCRE8 +#if defined(ERLANG_INTEGRATION) +PCRE_EXP_DEFN int PCRE_CALL_CONVENTION +erts_pcre_exec(const pcre *argument_re, const erts_pcre_extra *extra_data, + PCRE_SPTR subject, int length, int start_offset, int options, int *offsets, + int offsetcount) +#else PCRE_EXP_DEFN int PCRE_CALL_CONVENTION pcre_exec(const pcre *argument_re, const pcre_extra *extra_data, PCRE_SPTR subject, int length, int start_offset, int options, int *offsets, int offsetcount) +#endif #elif defined COMPILE_PCRE16 PCRE_EXP_DEFN int PCRE_CALL_CONVENTION pcre16_exec(const pcre16 *argument_re, const pcre16_extra *extra_data, @@ -6804,7 +6811,7 @@ pcre_uchar req_char; } else { if (extra_data != NULL && (extra_data->flags & PCRE_EXTRA_LOOP_LIMIT)) { - exec_context = (PcreExecContext *) (PUBL(malloc))(sizeof(PcreExecContext)); + exec_context = (PcreExecContext *) (erts_pcre_malloc)(sizeof(PcreExecContext)); *(extra_data->restart_data) = (void *) exec_context; /* need freeing by special routine from client */ } else { |