[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace] kwin: Clean up the X11 definitions after the X11
From:       Raphael Kubo da Costa <rakuco () FreeBSD ! org>
Date:       2011-10-31 20:31:53
Message-ID: 20111031203153.720DDA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit eb47d1ce9f10ac23eb03b33a00e41dc2663ce096 by Raphael Kubo da Cost=
a.
Committed on 31/10/2011 at 21:29.
Pushed by rkcosta into branch 'master'.

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

M  +3    -1    kwin/sm.h

http://commits.kde.org/kde-workspace/eb47d1ce9f10ac23eb03b33a00e41dc2663ce0=
96

diff --git a/kwin/sm.h b/kwin/sm.h
index c6ae9c4..803e14a 100644
--- a/kwin/sm.h
+++ b/kwin/sm.h
@@ -25,10 +25,12 @@ along with this program.  If not, see <http://www.gnu.o=
rg/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
[prev in list] [next in list] [prev in thread] [next in thread]