diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2017-10-11 14:44:19 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2017-10-11 14:44:43 +0200 |
| commit | 50bd4996fd96805b896ce77810f0a843e1190f86 (patch) | |
| tree | 89593316976cb8f5d03ffb0b93a6ca2a4f94025b | |
| parent | b65e6cfe35adfcb29dcf000c0febf28bb600479a (diff) | |
| parent | 62098a10aa56e5460e3f4316fc06a40bc1bf2da0 (diff) | |
| download | php-git-50bd4996fd96805b896ce77810f0a843e1190f86.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Use PHP_VERSION for exif
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/exif/php_exif.h | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -2,6 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 7.2.0RC5 +- Exif: + . Fixed bug #75301 (Exif extension has built in revision version). (Peter + Kokot). 12 Oct 2017, PHP 7.2.0RC4 diff --git a/ext/exif/php_exif.h b/ext/exif/php_exif.h index 4576c38637..92de6d426b 100644 --- a/ext/exif/php_exif.h +++ b/ext/exif/php_exif.h @@ -22,7 +22,7 @@ #if HAVE_EXIF #include "php_version.h" -#define PHP_EXIF_VERSION "1.4 $Id: 8bdc0c8f27c2c9dd1f7551f1f9fe3ab57a06a4b1 $" +#define PHP_EXIF_VERSION PHP_VERSION extern zend_module_entry exif_module_entry; #define phpext_exif_ptr &exif_module_entry |