diff options
| author | George Wang <gwang@php.net> | 2014-09-03 11:28:30 -0400 |
|---|---|---|
| committer | George Wang <gwang@php.net> | 2014-09-03 11:28:30 -0400 |
| commit | b16929ca7294fb047e63eb6c04d715d980a50c47 (patch) | |
| tree | e8ccc6acd38dbf670380cccc500100279d74f53d /ext/pcre | |
| parent | bba16dde5ded45802543712bb3b9fe6e93b10751 (diff) | |
| parent | 9266227402f50e1ad9953952b68a5ff3a25806b0 (diff) | |
| download | php-git-b16929ca7294fb047e63eb6c04d715d980a50c47.tar.gz | |
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Diffstat (limited to 'ext/pcre')
| -rw-r--r-- | ext/pcre/pcrelib/ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pcre/pcrelib/ChangeLog b/ext/pcre/pcrelib/ChangeLog index 1f1e860035..1e5fd3274a 100644 --- a/ext/pcre/pcrelib/ChangeLog +++ b/ext/pcre/pcrelib/ChangeLog @@ -5311,7 +5311,7 @@ by an auxiliary program - but can then be edited by hand if required. There are now no calls to isalnum(), isspace(), isdigit(), isxdigit(), tolower() or toupper() in the code. -7. Turn the malloc/free funtions variables into pcre_malloc and pcre_free and +7. Turn the malloc/free functions variables into pcre_malloc and pcre_free and make them global. Abolish the function for setting them, as the caller can now set them directly. |