diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-04-15 09:58:01 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-04-15 09:58:01 +0200 |
| commit | 65543af56f4f97180b8dda998d5d7101d51ac1a3 (patch) | |
| tree | 48cfdcb6bd0cd8e5ed17fed56b55dd7f88ea8233 /nx-X11/lib/X11/FontInfo.c | |
| parent | 097562b8bbc04d421e0ab5e1e7a0b705e393c20e (diff) | |
| download | nx-libs-65543af56f4f97180b8dda998d5d7101d51ac1a3.tar.gz nx-libs-65543af56f4f97180b8dda998d5d7101d51ac1a3.tar.bz2 nx-libs-65543af56f4f97180b8dda998d5d7101d51ac1a3.zip | |
old-arch cleanup: Drop CRAY support (i.e., drop code related to CRAY, _CRAY, WORD64, WORD64ALIGN, MUSTCOPY definitions).
Diffstat (limited to 'nx-X11/lib/X11/FontInfo.c')
| -rw-r--r-- | nx-X11/lib/X11/FontInfo.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/nx-X11/lib/X11/FontInfo.c b/nx-X11/lib/X11/FontInfo.c index f92375853..bc096fef7 100644 --- a/nx-X11/lib/X11/FontInfo.c +++ b/nx-X11/lib/X11/FontInfo.c @@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group. #endif #include "Xlibint.h" -#if defined(XF86BIGFONT) && !defined(MUSTCOPY) +#if defined(XF86BIGFONT) #define USE_XF86BIGFONT #endif #ifdef USE_XF86BIGFONT @@ -135,31 +135,9 @@ XFontStruct **info) /* RETURN */ fs->ascent = cvtINT16toInt (reply.fontAscent); fs->descent = cvtINT16toInt (reply.fontDescent); -#ifdef MUSTCOPY - { - xCharInfo *xcip; - - xcip = (xCharInfo *) &reply.minBounds; - fs->min_bounds.lbearing = xcip->leftSideBearing; - fs->min_bounds.rbearing = xcip->rightSideBearing; - fs->min_bounds.width = xcip->characterWidth; - fs->min_bounds.ascent = xcip->ascent; - fs->min_bounds.descent = xcip->descent; - fs->min_bounds.attributes = xcip->attributes; - - xcip = (xCharInfo *) &reply.maxBounds; - fs->max_bounds.lbearing = xcip->leftSideBearing; - fs->max_bounds.rbearing = xcip->rightSideBearing; - fs->max_bounds.width = xcip->characterWidth; - fs->max_bounds.ascent = xcip->ascent; - fs->max_bounds.descent = xcip->descent; - fs->max_bounds.attributes = xcip->attributes; - } -#else /* XXX the next two statements won't work if short isn't 16 bits */ fs->min_bounds = * (XCharStruct *) &reply.minBounds; fs->max_bounds = * (XCharStruct *) &reply.maxBounds; -#endif /* MUSTCOPY */ fs->n_properties = reply.nFontProps; if (fs->n_properties > 0) { |