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_compile.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_compile.c')
| -rw-r--r-- | erts/emulator/pcre/pcre_compile.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c index 5652bad0ce..d48126a55d 100644 --- a/erts/emulator/pcre/pcre_compile.c +++ b/erts/emulator/pcre/pcre_compile.c @@ -7728,9 +7728,15 @@ Returns: pointer to compiled data block, or NULL on error, */ #if defined COMPILE_PCRE8 +#if defined(ERLANG_INTEGRATION) +PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION +erts_pcre_compile(const char *pattern, int options, const char **errorptr, + int *erroroffset, const unsigned char *tables) +#else PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION pcre_compile(const char *pattern, int options, const char **errorptr, int *erroroffset, const unsigned char *tables) +#endif #elif defined COMPILE_PCRE16 PCRE_EXP_DEFN pcre16 * PCRE_CALL_CONVENTION pcre16_compile(PCRE_SPTR16 pattern, int options, const char **errorptr, @@ -7742,7 +7748,12 @@ pcre32_compile(PCRE_SPTR32 pattern, int options, const char **errorptr, #endif { #if defined COMPILE_PCRE8 +#if defined(ERLANG_INTEGRATION) +return erts_pcre_compile2(pattern, options, NULL, errorptr, + erroroffset, tables); +#else return pcre_compile2(pattern, options, NULL, errorptr, erroroffset, tables); +#endif #elif defined COMPILE_PCRE16 return pcre16_compile2(pattern, options, NULL, errorptr, erroroffset, tables); #elif defined COMPILE_PCRE32 @@ -7752,9 +7763,15 @@ return pcre32_compile2(pattern, options, NULL, errorptr, erroroffset, tables); #if defined COMPILE_PCRE8 +#if defined(ERLANG_INTEGRATION) +PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION +erts_pcre_compile2(const char *pattern, int options, int *errorcodeptr, + const char **errorptr, int *erroroffset, const unsigned char *tables) +#else PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION pcre_compile2(const char *pattern, int options, int *errorcodeptr, const char **errorptr, int *erroroffset, const unsigned char *tables) +#endif #elif defined COMPILE_PCRE16 PCRE_EXP_DEFN pcre16 * PCRE_CALL_CONVENTION pcre16_compile2(PCRE_SPTR16 pattern, int options, int *errorcodeptr, |