From kde-commits  Fri Jan 10 12:23:25 2003
From: Karol Szwed <gallium () kde ! org>
Date: Fri, 10 Jan 2003 12:23:25 +0000
To: kde-commits
Subject: kdebase/kcontrol/background
X-MARC-Message: https://marc.info/?l=kde-commits&m=104220144805646

CVS commit by gallium: 

Build, baby! Build!

--enable-final fix


  M +5 -1      backgnd.cpp   1.75
  M +6 -3      bgsettings.cc   1.32


--- kdebase/kcontrol/background/backgnd.cpp  #1.74:1.75
@@ -48,4 +48,8 @@
 #include <X11/Xlib.h>
 
+// Clean up after X.h/Xlib.h
+#undef Bool
+#undef Unsorted
+
 /**** KBGMonitor ****/
 

--- kdebase/kcontrol/background/bgsettings.cc  #1.31:1.32
@@ -10,8 +10,13 @@
  */
 
+#include <netwm.h>
 #include <time.h>
 #include <stdlib.h>
 #include <unistd.h>
 
+// Clean up after X.h/Xlib.h
+#undef Bool
+#undef Unsorted
+
 #include <qdir.h>
 #include <qpixmap.h>
@@ -19,6 +24,4 @@
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
-
-#include <netwm.h>
 
 #include "bgdefaults.h"