diff options
Diffstat (limited to 'nx-X11/lib/font')
| -rw-r--r-- | nx-X11/lib/font/fc/fslibos.h | 4 | ||||
| -rw-r--r-- | nx-X11/lib/font/fontfile/ffcheck.c | 2 | ||||
| -rw-r--r-- | nx-X11/lib/font/fontfile/register.c | 12 |
3 files changed, 5 insertions, 13 deletions
diff --git a/nx-X11/lib/font/fc/fslibos.h b/nx-X11/lib/font/fc/fslibos.h index acc1f16dc..dd266bdc4 100644 --- a/nx-X11/lib/font/fc/fslibos.h +++ b/nx-X11/lib/font/fc/fslibos.h @@ -90,11 +90,7 @@ from The Open Group. #endif /* FONT_OPEN_MAX */ -#ifdef WORD64 -#define NMSKBITS 64 -#else #define NMSKBITS 32 -#endif #define MSKCNT ((FONT_OPEN_MAX + NMSKBITS - 1) / NMSKBITS) 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 |