Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Use PHP_VERSION for exif
This commit is contained in:
Christoph M. Becker 2017-10-11 14:44:19 +02:00
commit 50bd4996fd
2 changed files with 4 additions and 1 deletions

3
NEWS
View file

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

View file

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