cvs: php4(PHP_4_3) /ext/gd config.m4 /ext/gd/libgd gdxpm.c
| From: | Ilia Alshanetsky | Date: | Mon, 25 Nov 2002 23:12:15 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/gd config.m4 /ext/gd/libgd gdxpm.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-16646@lists.php.net to get a copy of this message | ||
iliaa Mon Nov 25 18:12:15 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/gd config.m4
/php4/ext/gd/libgd gdxpm.c
Log:
MFH (fixed a compile failure when --with-xpm-dir is used).
Index: php4/ext/gd/config.m4
diff -u php4/ext/gd/config.m4:1.120.2.3 php4/ext/gd/config.m4:1.120.2.4
--- php4/ext/gd/config.m4:1.120.2.3 Sun Nov 17 19:43:48 2002
+++ php4/ext/gd/config.m4 Mon Nov 25 18:12:15 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.120.2.3 2002/11/18 00:43:48 sniper Exp $
+dnl $Id: config.m4,v 1.120.2.4 2002/11/25 23:12:15 iliaa Exp $
dnl
dnl
@@ -112,7 +112,7 @@
fi
for i in include include/X11; do
- test -f $GD_XPM_DIR/$i/xpm.h && GD_XPM_INC=$GD_XPM_DIR/$i
+ test -f $GD_XPM_DIR/$i/xpm.h && GD_XPM_INC=$GD_XPM_DIR/include
done
if test -z "$GD_XPM_INC"; then
Index: php4/ext/gd/libgd/gdxpm.c
diff -u php4/ext/gd/libgd/gdxpm.c:1.2 php4/ext/gd/libgd/gdxpm.c:1.2.2.1
--- php4/ext/gd/libgd/gdxpm.c:1.2 Wed Oct 30 12:54:36 2002
+++ php4/ext/gd/libgd/gdxpm.c Mon Nov 25 18:12:15 2002
@@ -20,7 +20,7 @@
#else
-#include "xpm.h"
+#include <X11/xpm.h>
#include <string.h>
gdImagePtr