aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/font
diff options
context:
space:
mode:
authorMike DePaulo <mikedep333@users.noreply.github.com>2015-04-16 18:30:39 -0400
committerMike DePaulo <mikedep333@users.noreply.github.com>2015-04-16 18:30:39 -0400
commit8b1577599271da1ac50ebb38d7297769f6b1139c (patch)
tree7ece6e6befb03e6818f65687209df98cdb17307a /nx-X11/lib/font
parent0d9217127f3e81fa19037f4923949b10443c5f1d (diff)
parentac9fbaabd6bdbca6dd1d94fa385aea41fdebf2c1 (diff)
downloadnx-libs-8b1577599271da1ac50ebb38d7297769f6b1139c.tar.gz
nx-libs-8b1577599271da1ac50ebb38d7297769f6b1139c.tar.bz2
nx-libs-8b1577599271da1ac50ebb38d7297769f6b1139c.zip
Merge pull request #12 from sunweaver/pr/arch-cleanup.CRAY
arch cleanup (CRAY/WORD64) + X.Org CVE-2013-7439
Diffstat (limited to 'nx-X11/lib/font')
-rw-r--r--nx-X11/lib/font/fc/fslibos.h4
-rw-r--r--nx-X11/lib/font/fontfile/ffcheck.c2
-rw-r--r--nx-X11/lib/font/fontfile/register.c12
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