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

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

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index ced5210301..464951b714 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -1288,10 +1288,13 @@ PHP_MINFO_FUNCTION(gd)
 	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);
 	}