From e9e1186f1d9a8772345da42b0d395d4e41c3d0a6 Mon Sep 17 00:00:00 2001
From: dan <dan>
Date: Sat, 30 Oct 2004 06:39:27 +0000
Subject: [PATCH] attempt to fix compilation on solaris with openwin

---
 ChangeLog            |  1 +
 WINGs/WINGs/WINGs.h  |  2 +-
 WINGs/WINGs/WINGsP.h |  2 +-
 WINGs/wfont.c        | 10 +++++-----
 acinclude.m4         |  1 +
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 96419ba4..f61ee1ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Changes since version 0.91.0:
 - updated Japanese translations (Takeo Hashimoto <HashimotoTakeo@mac.com>)
 - allow disable of switch panel when SwitchPanelImages=None
 - added X Input Methods support in WINGs
+- fixed issue with compiling on Solaris with openwin
 
 
 Changes since version 0.90.0:
diff --git a/WINGs/WINGs/WINGs.h b/WINGs/WINGs/WINGs.h
index 3fdf4ed3..503968c8 100644
--- a/WINGs/WINGs/WINGs.h
+++ b/WINGs/WINGs/WINGs.h
@@ -7,7 +7,7 @@
 #include <WINGs/WUtil.h>
 #include <X11/Xlib.h>
 
-#define WINGS_H_VERSION  20040406
+#define WINGS_H_VERSION  20041030
 
 
 #ifdef __cplusplus
diff --git a/WINGs/WINGs/WINGsP.h b/WINGs/WINGs/WINGsP.h
index ff840a51..01faf088 100644
--- a/WINGs/WINGs/WINGsP.h
+++ b/WINGs/WINGs/WINGsP.h
@@ -8,7 +8,7 @@
 
 #include <WINGs/WINGs.h>
 
-#if WINGS_H_VERSION < 20040406
+#if WINGS_H_VERSION < 20041030
 #error There_is_an_old_WINGs.h_file_somewhere_in_your_system._Please_remove_it.
 #endif
 
diff --git a/WINGs/wfont.c b/WINGs/wfont.c
index fe0c4356..03c6d002 100644
--- a/WINGs/wfont.c
+++ b/WINGs/wfont.c
@@ -1,17 +1,17 @@
 
-#include "wconfig.h"
-
-#include <X11/Xft/Xft.h>
-#include <fontconfig/fontconfig.h>
-
 #include <stdlib.h>
 
+#include "wconfig.h"
+
 #include "WINGsP.h"
 
 #include <wraster.h>
 #include <assert.h>
 #include <X11/Xlocale.h>
 
+#include <X11/Xft/Xft.h>
+#include <fontconfig/fontconfig.h>
+
 
 #define DEFAULT_FONT "sans serif:pixelsize=12"
 
diff --git a/acinclude.m4 b/acinclude.m4
index ee22091b..4cd15475 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -41,6 +41,7 @@ AC_MSG_CHECKING([whether libXft is at least version $1])
 AC_CACHE_VAL(ac_cv_lib_xft_version_ok,
 [AC_TRY_LINK(
 [/* Test version of libXft we have */
+#include <X11/Xlib.h>
 #include <X11/Xft/Xft.h>
 
 #if !defined(XFT_VERSION) || XFT_VERSION < $xft_major_version*10000 + $xft_minor_version*100 + $xft_micro_version
-- 
2.11.4.GIT