diff options
author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:28:20 +0000 |
---|---|---|
committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:28:20 +0000 |
commit | fb0cbe6e7287d635a5f368e055cc0aae6ed50125 (patch) | |
tree | 24940f60afb7e084ca0760710bf9d1ffd21c384a /src/FreeType/ft.h | |
parent | ca219ad2fc4f392505d378dfa5a2b34d33de6d61 (diff) |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'src/FreeType/ft.h')
-rw-r--r-- | src/FreeType/ft.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/FreeType/ft.h b/src/FreeType/ft.h index d4cacc2..b597457 100644 --- a/src/FreeType/ft.h +++ b/src/FreeType/ft.h @@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/FreeType/ft.h,v 1.19 2002/10/01 00:02:09 alanh Exp $ */ +/* $XFree86: xc/lib/font/FreeType/ft.h,v 1.23 2003/10/19 18:53:49 dawes Exp $ */ #ifndef _FT_H_ #define _FT_H_ @@ -52,6 +52,10 @@ THE SOFTWARE. /* Is x significantly different from 0 w.r.t. y? */ #define DIFFER0(x,y) (fabs(x)>=NEGLIGIBLE*fabs(y)) +#ifndef ABS +#define ABS(x) ((x) >= 0 ? (x) : -(x)) +#endif + /* Two to the sixteenth power, as a double. */ #define TWO_SIXTEENTH ((double)(1<<16)) #define TWO_SIXTH ((double)(1<<6)) @@ -70,7 +74,9 @@ typedef struct _FTMapping /* ftfuncs.c */ +#if 0 void FreeTypeRegisterFontFileFunctions(void); +#endif /* ftenc.c */ @@ -79,7 +85,6 @@ unsigned FTRemap(FT_Face face, FTMappingPtr, unsigned code); /* fttools.c */ -int FTu2a(int, char*, char*, int, int); int FTtoXReturnCode(int); int FTGetEnglishName(FT_Face, int, char *, int); int FTcheckForTTCName(char*, char**, int*); |