From: Pierre Joye <pajoye@php.net>
Date: Mon, 7 May 2007 14:54:36 +0000 (+0000)
Subject: - MFH: fix build when use with a museum freetype version (1.x)
X-Git-Tag: php-5.2.3RC1~142
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a8e75b9901a70f1a70b7bc46a9bc09a13cd539d;p=php

- MFH: fix build when use with a museum freetype version (1.x)
---

diff --git a/NEWS b/NEWS
index 06eb440cf3..5df9028683 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ PHP                                                                        NEWS
 - Fixed PHP CLI to use the php.ini from the binary location. (Hannes)
 - Fixed bug #41293 (Fixed creation of HTTP_RAW_POST_DATA when there is no
   default post handler). (Ilia)
+- Fixed gd build when used with freetype 1.x (Pierre, Tony)
 - Fixed bug #41287 (Namespace functions don't allow xmlns defintion to be 
   optional). (Rob)
 - Fixed bug #41285 (Improved fix for CVE-2007-1887 to work with non-bundled
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 8f6e3f7a73..71bd7b966a 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -1370,8 +1370,10 @@ PHP_MINFO_FUNCTION(gd)
 		char tmp[256];
 #ifdef FREETYPE_PATCH
 		snprintf(tmp, sizeof(tmp), "%d.%d.%d", FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH);
-#else
+#elif defined(FREETYPE_MAJOR)
 		snprintf(tmp, sizeof(tmp), "%d.%d", FREETYPE_MAJOR, FREETYPE_MINOR);
+#else
+		snprintf(tmp, sizeof(tmp), "1.x");
 #endif
 		php_info_print_table_row(2, "FreeType Version", tmp);
 	}