From f58653bdcdab00ec7d1618a56d3e77b8489b0d12 Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Mon, 31 Oct 2011 18:29:18 -0200
Subject: [PATCH] Clean up the X11 definitions after the X11 includes.

This fixes build problems after 8f43c5e: sm.h would include
X11/SM/SMlib.h, which includes X11/ICE/ICElib.h, which adds a #define
Status int, which breaks qdeclarativeview.h, included by
moc_declarative.cpp.

Reviewed-by: mgraesslin
---
 sm.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sm.h b/sm.h
index c6ae9c41c6..803e14ad93 100644
--- a/sm.h
+++ b/sm.h
@@ -25,10 +25,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QDataStream>
 #include <kapplication.h>
 #include <ksessionmanager.h>
-#include <X11/SM/SMlib.h>
 #include <netwm_def.h>
 #include <QRect>
 
+#include <X11/SM/SMlib.h>
+#include <fixx11h.h>
+
 class QSocketNotifier;
 
 namespace KWin