com php-src: Merge branch 'PHP-7.0': ext/gd/gd_compat.c
| From: | Xinchen Hui | Date: | Fri, 20 Nov 2015 07:22:59 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0': ext/gd/gd_compat.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89929@lists.php.net to get a copy of this message | ||
Commit: 8a50a96f465b714434626dcf7d5a9fcc3134ff76
Author: Xinchen Hui <laruence@gmail.com> Fri, 20 Nov 2015 15:22:59 +0800
Parents: 8b920e0639bc2cc0249fc56648c3e112f593d5bd 7e68d6e73505c62efef55d66e763467c30cd76d2
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8a50a96f465b714434626dcf7d5a9fcc3134ff76
Log:
Merge branch 'PHP-7.0'
Changed paths:
MM ext/gd/gd_compat.c
Diff:
diff --cc ext/gd/gd_compat.c
index af55e42,aedc9b3..79862bf
--- a/ext/gd/gd_compat.c
+++ b/ext/gd/gd_compat.c
@@@ -1,4 -1,6 +1,8 @@@
-#include "php_config.h"
+#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+
+ #ifdef HAVE_CONFIG_H
#include "config.h"
#endif