Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fix extern declaration according to definition
This commit is contained in:
Felipe Pena 2013-10-20 01:16:10 -02:00
commit 0d6247f968

View file

@ -59,7 +59,7 @@
PHPAPI extern const char php_sig_gif[3];
PHPAPI extern const char php_sig_jpg[3];
PHPAPI extern const char php_sig_png[3];
PHPAPI extern const char php_sig_png[8];
extern zend_module_entry gd_module_entry;
#define phpext_gd_ptr &gd_module_entry