pajoye Mon May 7 14:50:07 2007 UTC
Modified files:
/php-src/ext/gd gd.c
Log:
- fix build when use with a museum freetype version (1.x)
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.373&r2=1.374&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.373 php-src/ext/gd/gd.c:1.374
--- php-src/ext/gd/gd.c:1.373 Tue Apr 17 15:44:25 2007
+++ php-src/ext/gd/gd.c Mon May 7 14:50:07 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.373 2007/04/17 15:44:25 bjori Exp $ */
+/* $Id: gd.c,v 1.374 2007/05/07 14:50:07 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1288,10 +1288,13 @@
php_info_print_table_row(2, "FreeType Linkage", "with freetype");
{
char tmp[256];
+
#ifdef FREETYPE_PATCH
- snprintf(tmp, sizeof(tmp), "%d.%d.%d", FREETYPE_MAJOR,
FREETYPE_MINOR, FREETYPE_PATCH);
+ snprintf(tmp, sizeof(tmp), "%d.%d.%d", FREETYPE_MAJOR, FREETYPE_MINOR,
FREETYPE_PATCH);
+#elif defined(FREETYPE_MAJOR)
+ snprintf(tmp, sizeof(tmp), "%d.%d", FREETYPE_MAJOR, FREETYPE_MINOR);
#else
- snprintf(tmp, sizeof(tmp), "%d.%d", FREETYPE_MAJOR,
FREETYPE_MINOR);
+ snprintf(tmp, sizeof(tmp), "1.x");
#endif
php_info_print_table_row(2, "FreeType Version", tmp);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
