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-16 14:09:07 +0200 |
| commit | bad67799229b94ea2ba0174319949766ad1c2fc6 (patch) | |
| tree | 3a698e5e7544952aefe5cf927a685c76759a8088 /nx-X11/lib/font/fontfile | |
| parent | 097562b8bbc04d421e0ab5e1e7a0b705e393c20e (diff) | |
| download | nx-libs-bad67799229b94ea2ba0174319949766ad1c2fc6.tar.gz nx-libs-bad67799229b94ea2ba0174319949766ad1c2fc6.tar.bz2 nx-libs-bad67799229b94ea2ba0174319949766ad1c2fc6.zip | |
old-arch cleanup: Drop CRAY support (i.e., drop code related to CRAY, _CRAY, WORD64, WORD64ALIGN, MUSTCOPY, UNSIGNEDBITFIELDS definitions).
Diffstat (limited to 'nx-X11/lib/font/fontfile')
| -rw-r--r-- | nx-X11/lib/font/fontfile/ffcheck.c | 2 | ||||
| -rw-r--r-- | nx-X11/lib/font/fontfile/register.c | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/nx-X11/lib/font/fontfile/ffcheck.c b/nx-X11/lib/font/fontfile/ffcheck.c index 9a70a17f9..d3d121700 100644 --- a/nx-X11/lib/font/fontfile/ffcheck.c +++ b/nx-X11/lib/font/fontfile/ffcheck.c @@ -125,14 +125,12 @@ FontFileCheckRegisterFpeFunctions (void) BitmapRegisterFontFileFunctions (); -#ifndef CRAY #ifdef BUILD_SPEEDO SpeedoRegisterFontFileFunctions (); #endif #ifdef BUILD_TYPE1 Type1RegisterFontFileFunctions(); #endif -#endif #ifdef BUILD_CID CIDRegisterFontFileFunctions(); #endif diff --git a/nx-X11/lib/font/fontfile/register.c b/nx-X11/lib/font/fontfile/register.c index cb74c7cab..5ddab0386 100644 --- a/nx-X11/lib/font/fontfile/register.c +++ b/nx-X11/lib/font/fontfile/register.c @@ -54,13 +54,11 @@ in this Software without prior written authorization from The Open Group. * with other packages. */ -#ifndef CRAY -# ifdef BUILD_SPEEDO -# define XFONT_SPEEDO 1 -# endif -# ifdef BUILD_TYPE1 -# define XFONT_TYPE1 1 -# endif +#ifdef BUILD_SPEEDO +# define XFONT_SPEEDO 1 +#endif +#ifdef BUILD_TYPE1 +# define XFONT_TYPE1 1 #endif #ifdef BUILD_CID |