File U_Only-call-SnfSetFormat-if-libXfont-is-built-w... of Package xfs

Overview Repositories Revisions Requests Users Attributes Meta

File U_Only-call-SnfSetFormat-if-libXfont-is-built-with-SNF.patch of Package xfs (Revision 196608de9b9b078c86582b62658fc18d)

Currently displaying revision 196608de9b9b078c86582b62658fc18d , Show latest

From 659e9deafa76bb7feab16afc848392536361c92b Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri, 16 May 2014 15:33:56 -0700
Subject: [PATCH] Only call SnfSetFormat if libXfont is built with SNF support

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---
 os/config.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/os/config.c b/os/config.c
index 2e5dc1c..81275ea 100644
--- a/os/config.c
+++ b/os/config.c
@@ -60,6 +60,7 @@ in this Software without prior written authorization from The Open Group.
 #include	"difsutils.h"
 #include	<X11/fonts/fontutil.h>
 #include	"difs.h"
+#include	<X11/fonts/fontconf.h>
 
 /* libXfont/src/bitmap/snfstr.h */
 extern void SnfSetFormat(int bit, int byte, int glyph, int scan);
@@ -660,6 +661,8 @@ config_set_snf_format (
     val = config_parse_int (parm, val, &ret, &scan);
     if (ret == -1)
 	return val;
+#ifdef XFONT_SNFFORMAT
     SnfSetFormat (bit, byte, glyph, scan);
+#endif
     return val;
 }
-- 
1.8.4.5

Places

File U_Only-call-SnfSetFormat-if-libXfont-is-built-with-SNF.patch of Package xfs (Revision 196608de9b9b078c86582b62658fc18d)

Places