summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2014-05-16 15:33:56 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2014-05-20 21:45:22 -0700
commit659e9deafa76bb7feab16afc848392536361c92b (patch)
tree23afa8ac3cd84b57628d6a101a158ba4ca307947
parent013df6f7d4ad0f3f2a74993733fc62ab67ffd484 (diff)
Only call SnfSetFormat if libXfont is built with SNF support
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--os/config.c3
1 files changed, 3 insertions, 0 deletions
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;
}