--enable-final fixes

svn path=/trunk/kdebase/kwin/; revision=47102
2000-04-20 17:37:33 +00:00 · 2000-04-20 17:37:33 +00:00 · 99c4839913
parent f02955dcba
commit 99c4839913
2 changed files with 8 additions and 0 deletions
--- a/main.cpp
+++ b/main.cpp
@ -3,6 +3,10 @@ kwin - the KDE window manager

 Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 ******************************************************************/
+
+// X11/Qt conflict
+#undef Bool
+
 #include <kconfig.h>
 #include "main.h"
 #include "options.h"
--- a/plugins.cpp
+++ b/plugins.cpp
@ -9,6 +9,10 @@ Copyright (C) 1999, 2000    Daniel M. Duley <mosfet@kde.org>
 #include <kdesktopfile.h>
 #include <ksimpleconfig.h>
 #include <klocale.h>
+
+// X11/Qt conflict
+#undef Unsorted
+
 #include <qdir.h>
 #include <qfile.h>