diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:26:57 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:26:57 +0000 |
| commit | ac8f15d8622a23dd57928f1c40da5ecafbb31492 (patch) | |
| tree | b465a0b386ce699c33c736b3a341a183901f7f17 /src/TextExt16.c | |
| parent | 917de4a98eeb9a7eafeab7ddd8e1b1ae6aae6514 (diff) | |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'src/TextExt16.c')
| -rw-r--r-- | src/TextExt16.c | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/src/TextExt16.c b/src/TextExt16.c index 14064f6..5707faa 100644 --- a/src/TextExt16.c +++ b/src/TextExt16.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/TextExt16.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/TextExt16.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */ /* * Copyright 1995 by FUJITSU LIMITED * This is source code modified by FUJITSU LIMITED under the Joint @@ -44,7 +44,6 @@ from The Open Group. * XChar2bs. */ int -#if NeedFunctionPrototypes XTextExtents16 ( XFontStruct *fs, _Xconst XChar2b *string, @@ -53,14 +52,6 @@ XTextExtents16 ( int *font_ascent, /* RETURN font information */ int *font_descent, /* RETURN font information */ register XCharStruct *overall) /* RETURN character information */ -#else -XTextExtents16 (fs, string, nchars, dir, font_ascent, font_descent, overall) - XFontStruct *fs; - XChar2b *string; - int nchars; - int *dir, *font_ascent, *font_descent; /* RETURN font information */ - register XCharStruct *overall; /* RETURN character information */ -#endif { int i; /* iterator */ Bool singlerow = (fs->max_byte1 == 0); /* optimization */ @@ -127,17 +118,11 @@ XTextExtents16 (fs, string, nchars, dir, font_ascent, font_descent, overall) * XTextWidth16 - compute the width of sequence of XChar2bs. This is a * subset of XTextExtents16. */ -#if NeedFunctionPrototypes -int XTextWidth16 ( +int +XTextWidth16 ( XFontStruct *fs, _Xconst XChar2b *string, int count) -#else -int XTextWidth16 (fs, string, count) - XFontStruct *fs; - XChar2b *string; - int count; -#endif { int i; /* iterator */ Bool singlerow = (fs->max_byte1 == 0); /* optimization */ @@ -179,17 +164,11 @@ int XTextWidth16 (fs, string, count) /* * _XTextHeight16 - compute the height of sequence of XChar2bs. */ -#if NeedFunctionPrototypes -int _XTextHeight16 ( +int +_XTextHeight16 ( XFontStruct *fs, _Xconst XChar2b *string, int count) -#else -int _XTextHeight16 (fs, string, count) - XFontStruct *fs; - XChar2b *string; - int count; -#endif { int i; /* iterator */ Bool singlerow = (fs->max_byte1 == 0); /* optimization */ |