diff options
author | Felipe Pena <felipensp@gmail.com> | 2013-10-20 01:16:10 -0200 |
---|---|---|
committer | Felipe Pena <felipensp@gmail.com> | 2013-10-20 01:16:10 -0200 |
commit | 0d6247f9683a8ba36bba30ad3bb8f3e01bc6dfdf (patch) | |
tree | 332d84a850bfa4a32c209c436d3bbd21b85f02ff /ext/gd | |
parent | 8d22c231617cafba3a34a490036cccb31a393d70 (diff) | |
parent | a1daebefda6b481450e3b9ec7461609a09e4f578 (diff) | |
download | php-git-0d6247f9683a8ba36bba30ad3bb8f3e01bc6dfdf.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fix extern declaration according to definition
Diffstat (limited to 'ext/gd')
-rw-r--r-- | ext/gd/php_gd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/gd/php_gd.h b/ext/gd/php_gd.h index 269c315e88..22fac40dd0 100644 --- a/ext/gd/php_gd.h +++ b/ext/gd/php_gd.h @@ -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 |