diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-04-27 23:22:44 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-04-27 23:25:32 -0700 |
| commit | 13c32a102c7626673f41dfecba4188a6c6c6934c (patch) | |
| tree | 69b9e5d3fbeb6780824c3de19d300b8a608de06c /ext/pcre/pcrelib/pcre_globals.c | |
| parent | 957aa220aa175a874f429f97701eede0f1ef14d3 (diff) | |
| parent | 23917b451bf4029e78082b4e0a56bc4c6f117990 (diff) | |
| download | php-git-13c32a102c7626673f41dfecba4188a6c6c6934c.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Upgrade PCRE to 8.36, it fixes some crashes
Diffstat (limited to 'ext/pcre/pcrelib/pcre_globals.c')
| -rw-r--r-- | ext/pcre/pcrelib/pcre_globals.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/pcre/pcrelib/pcre_globals.c b/ext/pcre/pcrelib/pcre_globals.c index 36e6ddb3a8..0f106aa901 100644 --- a/ext/pcre/pcrelib/pcre_globals.c +++ b/ext/pcre/pcrelib/pcre_globals.c @@ -6,7 +6,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel - Copyright (c) 1997-2012 University of Cambridge + Copyright (c) 1997-2014 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -72,6 +72,7 @@ PCRE_EXP_DATA_DEFN void (*PUBL(free))(void *) = LocalPcreFree; PCRE_EXP_DATA_DEFN void *(*PUBL(stack_malloc))(size_t) = LocalPcreMalloc; PCRE_EXP_DATA_DEFN void (*PUBL(stack_free))(void *) = LocalPcreFree; PCRE_EXP_DATA_DEFN int (*PUBL(callout))(PUBL(callout_block) *) = NULL; +PCRE_EXP_DATA_DEFN int (*PUBL(stack_guard))(void) = NULL; #elif !defined VPCOMPAT PCRE_EXP_DATA_DEFN void *(*PUBL(malloc))(size_t) = malloc; @@ -79,6 +80,7 @@ PCRE_EXP_DATA_DEFN void (*PUBL(free))(void *) = free; PCRE_EXP_DATA_DEFN void *(*PUBL(stack_malloc))(size_t) = malloc; PCRE_EXP_DATA_DEFN void (*PUBL(stack_free))(void *) = free; PCRE_EXP_DATA_DEFN int (*PUBL(callout))(PUBL(callout_block) *) = NULL; +PCRE_EXP_DATA_DEFN int (*PUBL(stack_guard))(void) = NULL; #endif /* End of pcre_globals.c */ |