From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 29 Nov 2017 16:06:47 +0000 (+0100)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~916
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa5c186cc00fb31c4953cb0006f9e8bc066ac77a;p=php

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.
---

fa5c186cc00fb31c4953cb0006f9e8bc066ac77a