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_config.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_config.c')
| -rw-r--r-- | erts/emulator/pcre/pcre_config.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/erts/emulator/pcre/pcre_config.c b/erts/emulator/pcre/pcre_config.c index a116cc7ac6..06fa3d324f 100644 --- a/erts/emulator/pcre/pcre_config.c +++ b/erts/emulator/pcre/pcre_config.c @@ -71,8 +71,13 @@ Returns: 0 if data returned, negative on error */ #if defined COMPILE_PCRE8 +#if defined(ERLANG_INTEGRATION) +PCRE_EXP_DEFN int PCRE_CALL_CONVENTION +erts_pcre_config(int what, void *where) +#else PCRE_EXP_DEFN int PCRE_CALL_CONVENTION pcre_config(int what, void *where) +#endif #elif defined COMPILE_PCRE16 PCRE_EXP_DEFN int PCRE_CALL_CONVENTION pcre16_config(int what, void *where) |