From 83705e52c469444de38bb676c097d175e66928a7 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 12 Aug 2003 18:05:08 +0000
Subject: [PATCH] add Xutil includes for these badboys on older X
 versions/solaris

---
 render/font.h   | 2 --
 render/render.h | 3 +--
 render/test.c   | 1 +
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/render/font.h b/render/font.h
index 6a6f1909..8b100c7a 100644
--- a/render/font.h
+++ b/render/font.h
@@ -1,7 +1,5 @@
 #ifndef __font_h
 #define __font_h
-#define _XFT_NO_COMPAT_ /* no Xft 1 API */
-#include <X11/Xft/Xft.h>
 #include "render.h"
 #include "geom.h"
 
diff --git a/render/render.h b/render/render.h
index e90b6fe6..3ddde716 100644
--- a/render/render.h
+++ b/render/render.h
@@ -1,10 +1,9 @@
 #ifndef __render_h
 #define __render_h
 
-#define _XFT_NO_COMPAT_ /* no Xft 1 API */
 #include <X11/Xlib.h> /* some platforms dont include this as needed for Xft */
+#define _XFT_NO_COMPAT_ /* no Xft 1 API */
 #include <X11/Xft/Xft.h>
-#include <X11/Xlib.h>
 #include <glib.h>
 
 typedef union  _RrTextureData      RrTextureData;
diff --git a/render/test.c b/render/test.c
index 38cd7a99..58a95cf7 100644
--- a/render/test.c
+++ b/render/test.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <X11/extensions/shape.h>
 #include <string.h>
 #include <stdlib.h>
-- 
2.39.2