Merge branch 'pull-request/2799' into PHP-7.0

* pull-request/2799: Use PHP_VERSION for exif
9 years ago · b497b6edf9
2 changed files with 4 additions and 2 deletions
--- a/4
+++ b/4
@ -2,7 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2017 PHP 7.0.26
 - Exif:
  . Fixed bug #75301 (Exif extension has built in revision version). (Peter
    Kokot).
 26 Oct 2017 PHP 7.0.25
--- 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