diff options
| author | Patrik Nyblom <[email protected]> | 2013-08-16 11:37:54 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2013-08-16 11:37:54 +0200 |
| commit | 5d9a587a8fcc164e02f043959338edec2ff69381 (patch) | |
| tree | 554f05a944777622b30031724010f6f31707565b /erts/emulator/pcre/pcre_chartables.c | |
| parent | 23610dbfc1c409f83349e9e293dd3cfc1f74d497 (diff) | |
| parent | 52cb62b7930d9c7b9e04a210ff6b02946f27ae79 (diff) | |
| download | otp-5d9a587a8fcc164e02f043959338edec2ff69381.tar.gz otp-5d9a587a8fcc164e02f043959338edec2ff69381.tar.bz2 otp-5d9a587a8fcc164e02f043959338edec2ff69381.zip | |
Merge branch 'pan/update_pcre_8.33'
* pan/update_pcre_8.33:
Workaround TR gnu/181328, GCC 4.2.1 20070831 on FreeBSD 9.1
Clarify relation between erts_iolist_{size|to_buf}
Fix backslash in titles of manpages
Correct UTF-8 in stdlib's notes.xml
Add more tests for corner error cases in erl_bif_re.c
Add documentation of report_errors and match_limit(_recursion)
Add match_limit and match_limit_recursion options
Add return_errors option to re:run/3
Add README for updating PCRE
Add documentation of extensions to re module
Add new options to Erlang re interface and mend dupnames
Update PCRE doc part of re.xml to PCRE 8.33 state
Integrate new PCRE test suites
Integrate patch for PCRE bug id 1370
Handle CRLF correctly in global regexp
Add erts_prefix to pcre_library and update erl_bif_re
Update to PCRE 8.33, w/o the erts_ prefix added
OTP-11204
OTP-11205
OTP-10285
Diffstat (limited to 'erts/emulator/pcre/pcre_chartables.c')
| -rw-r--r-- | erts/emulator/pcre/pcre_chartables.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/erts/emulator/pcre/pcre_chartables.c b/erts/emulator/pcre/pcre_chartables.c index f851b1b261..0d7ecd5261 100644 --- a/erts/emulator/pcre/pcre_chartables.c +++ b/erts/emulator/pcre/pcre_chartables.c @@ -14,12 +14,11 @@ example ISO-8859-1. When dftables is run, it creates these tables in the current locale. If PCRE is configured with --enable-rebuild-chartables, this happens automatically. -The following #includes are present because without the gcc 4.x may remove the +The following #includes are present because without them gcc 4.x may remove the array definition from the final binary if PCRE is built into a static library and dead code stripping is activated. This leads to link errors. Pulling in the header ensures that the array gets flagged as "someone outside this compilation unit might reference this" and so it will always be supplied to the linker. */ - /* %ExternalCopyright% */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -27,7 +26,7 @@ unit might reference this" and so it will always be supplied to the linker. */ #include "pcre_internal.h" -const unsigned char _erts_pcre_default_tables[] = { +const pcre_uint8 PRIV(default_tables)[] = { /* This table is a lower casing table. */ |