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

List:       kde-commits
Subject:    kdelibs/dcop
From:       David Faure <faure () kde ! org>
Date:       2004-05-18 16:07:42
Message-ID: 20040518160742.775C42AF9 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Make it compile with DCOP_LOG defined


  M +8 -7      dcopserver.cpp   1.167


--- kdelibs/dcop/dcopserver.cpp  #1.166:1.167
@@ -46,19 +46,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
 #include <limits.h>
 #endif
-#ifdef DCOP_LOG
-#include <string.h>
-#endif
 
 #define QT_CLEAN_NAMESPACE 1
 #include <qfile.h>
 #include <qtextstream.h>
-#ifdef DCOP_LOG
-#include <qdir.h>
-#endif
 #include <qdatastream.h>
 #include <qptrstack.h>
 #include <qtimer.h>
 
-#include <dcopserver.h>
+#include "dcopserver.h"
+
 #include <dcopsignals.h>
 #include <dcopclient.h>
@@ -66,4 +61,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
 #include "dcop-path.h"
 
+#ifdef DCOP_LOG
+#undef Unsorted
+#include <qdir.h>
+#include <string.h>
+#endif
+
 // #define DCOP_DEBUG
 


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