diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2017-11-29 17:06:47 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2017-11-29 17:06:47 +0100 |
| commit | fa5c186cc00fb31c4953cb0006f9e8bc066ac77a (patch) | |
| tree | d60e3af17d1043da167b44ad486eb59d73c6c844 /ext/spl/php_spl.c | |
| parent | 03da5f8e30cc65584d38d478ea566062ff99579b (diff) | |
| parent | 995ac8a09484b91aa9da6dc7387a6506e452fff2 (diff) | |
| download | php-git-fa5c186cc00fb31c4953cb0006f9e8bc066ac77a.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Define floorf if system doesn't have it (follow up for 22c48761)
Revert "Revert "ext/sodium: pwhash: do not warn on low parameters"" This reverts commit a1845b7fdb5916b0951146ca18bb67ca83854733.
Diffstat (limited to 'ext/spl/php_spl.c')
0 files changed, 0 insertions, 0 deletions