diff options
| author | Rickard Green <[email protected]> | 2017-04-11 15:05:51 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-04-11 15:05:51 +0200 |
| commit | 92a3b1a37182527d0bf8b6242d54e7fae6f4bbf9 (patch) | |
| tree | 133119634987a6eeede055d644fe2f999ea3d318 /erts/emulator/beam/sys.h | |
| parent | b66834310f1d3f30a7b4d5c02753053d3f9d7ef8 (diff) | |
| parent | 6520f78d4b878ff66adcf8d25de331d8ad06dd1d (diff) | |
| download | otp-92a3b1a37182527d0bf8b6242d54e7fae6f4bbf9.tar.gz otp-92a3b1a37182527d0bf8b6242d54e7fae6f4bbf9.tar.bz2 otp-92a3b1a37182527d0bf8b6242d54e7fae6f4bbf9.zip | |
Merge branch 'rickard/pcre-8.40'
OTP-14331
* rickard/pcre-8.40:
Update documentation
Update README.pcre_update.md
Stack guard for PCRE
Adjust for incompatibility between PCRE 8.40 and perl 5.22.1
Generate re replacement and split tests with perl vsn 5.22.1
Fix re_SUITE:pcre_compile_workspace_overflow/1
Skip line with lockout of modifiers in PCRE tests
Update tests for PCRE version 8.40
Update PCRE to version 8.40
Conflicts:
erts/emulator/beam/beam_debug.c
Diffstat (limited to 'erts/emulator/beam/sys.h')
| -rw-r--r-- | erts/emulator/beam/sys.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h index 144dd60d21..24de35696c 100644 --- a/erts/emulator/beam/sys.h +++ b/erts/emulator/beam/sys.h @@ -602,6 +602,8 @@ __decl_noreturn void __noreturn erts_exit(int n, char*, ...); Eterm erts_check_io_info(void *p); +UWord erts_sys_get_page_size(void); + /* Size of misc memory allocated from system dependent code */ Uint erts_sys_misc_mem_sz(void); |