From e53ddd046f0ddc1adac8b32c7624fd54dbf642ce Mon Sep 17 00:00:00 2001
From: dan <dan>
Date: Sat, 30 Oct 2004 07:17:49 +0000
Subject: [PATCH] fixed another spot where compiling on solaris with openwin
 generated errors

---
 ChangeLog         |  2 +-
 src/switchpanel.c | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f61ee1ac..268138aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +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
+- fixed issues with compiling on Solaris with openwin
 
 
 Changes since version 0.90.0:
diff --git a/src/switchpanel.c b/src/switchpanel.c
index a66e4ed1..51298ce4 100644
--- a/src/switchpanel.c
+++ b/src/switchpanel.c
@@ -25,12 +25,6 @@
 #include <string.h>
 #include <sys/time.h>
 
-#ifdef SHAPE
-#include <X11/extensions/shape.h>
-
-extern Bool wShapeSupported;
-#endif
-
 #include "WindowMaker.h"
 #include "screen.h"
 #include "wcore.h"
@@ -41,6 +35,13 @@ extern Bool wShapeSupported;
 #include "funcs.h"
 #include "xinerama.h"
 
+#ifdef SHAPE
+#include <X11/extensions/shape.h>
+
+extern Bool wShapeSupported;
+#endif
+
+
 struct SwitchPanel {
     WScreen *scr;
     WMWindow *win;
-- 
2.11.4.GIT