cvs: php4 /ext/gd gdttf.c

dbeu Mon Oct 16 06:55:47 2000 EDT Modified files: /php4/ext/gd gdttf.c Log: include php.h to have VIRTUAL_DIR defined this should fix bugs where the ttf functions won't find the font in the actual working dir # like under windows :) Index: php4/ext/gd/gdttf.c diff -u php4/ext/gd/gdttf.c:1.13 php4/ext/gd/gdttf.c:1.14 --- php4/ext/gd/gdttf.c:1.13 Mon Oct 16 06:50:30 2000 +++ php4/ext/gd/gdttf.c Mon Oct 16 06:55:47 2000 @@ -2,9 +2,11 @@ /* */ /* John Ellson ellson@lucent.com */ -/* $Id: gdttf.c,v 1.13 2000/10/16 13:50:30 hirokawa Exp $ */ +/* $Id: gdttf.c,v 1.14 2000/10/16 13:55:47 dbeu Exp $ */ -#if WIN32|WINNT +#include "php.h" + +#if PHP_WIN32 #include "config.w32.h" #else #include "php_config.h" @@ -44,6 +46,7 @@ #define RESOLUTION 72 /* Number of colors used for anti-aliasing */ +#undef NUMCOLORS #define NUMCOLORS 4 /* Line separation as a factor of font height. @@ -56,8 +59,12 @@ #define TRUE !FALSE #endif +#ifndef MAX #define MAX(a,b) ((a)>(b)?(a):(b)) +#endif +#ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) +#endif typedef struct { char *fontname; /* key */