From 5e6b72dc745eafa8b8b74e2d42ca8f2cac6aff4e Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 21 Mar 2016 14:18:42 +0100
Subject: hw/nxagent/NXdixfonts.c: Don't include <X11/fonts/fontstruct.h>. No
 symbol needed from that header file.

---
 nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
index 2f3a75147..c695ead8f 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
@@ -73,7 +73,6 @@ Equipment Corporation.
 #include <dix-config.h>
 #endif
 
-#include <X11/fonts/fontstruct.h>
 #include <nx-X11/X.h>
 #include <nx-X11/Xmd.h>
 #include <nx-X11/Xproto.h>
-- 
cgit v1.2.3


From e3e451629b00ab589f8720d498089dba0447cf8f Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 2 May 2016 15:38:30 +0200
Subject: hw/nxagent/NXdixfonts.c: Fix implicit declaration for
 register_fpe_functions().

---
 nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
index c695ead8f..33b0ea93d 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
@@ -176,6 +176,8 @@ _NXGetFontPathError:
 
 #define QUERYCHARINFO(pci, pr)  *(pr) = (pci)->metrics
 
+extern void register_fpe_functions(void);
+
 extern void * fosNaturalParams;
 extern FontPtr defaultFont;
 
-- 
cgit v1.2.3