add Xutil includes for these badboys on older X versions/solaris

diff --git a/render/font.h b/render/font.h
index 6a6f19092c4cf21f95bb0ad4e10a50f1971a4b9f..8b100c7ae4916e2d3e88908bec8bae02ed55f27c 100644 (file)
--- 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 e90b6fe6d60278fe26a36e6ad1654213c8e2ffc1..3ddde716ee42b6ec8f0cfb8bc08a658f8ab267b8 100644 (file)
--- 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 38cd7a99a2aad9155d897e474d09a7d5da82509e..58a95cf7a9aa46ed53a917fa3b5949594fe5d333 100644 (file)
--- 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>