summaryrefslogtreecommitdiff
path: root/ext/mbstring/php_mbregex.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-10-06 18:36:26 +0200
committerAnatol Belski <ab@php.net>2014-10-06 18:36:26 +0200
commitbd9f17846df5ca7c7f606e4392f02861523b7cd5 (patch)
tree280d445b62fb1a0d5655facdeb554184e665d3fc /ext/mbstring/php_mbregex.c
parent60f0695a0982c556c826191d28c8ba3a72fd2a2b (diff)
parent5d7ccb758b407d1ba6bc7502b22ebb7cfcd2912c (diff)
downloadphp-git-bd9f17846df5ca7c7f606e4392f02861523b7cd5.tar.gz
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: bring back the correct php_version.h fix the empty_strings SAPI shutdown leak in TS build Use fastcall calling convention for heap functions fix leaking the empty_string in TS builds remove successive assignment
Diffstat (limited to 'ext/mbstring/php_mbregex.c')
0 files changed, 0 insertions, 0 deletions