commit d3e22d9d55a4397096c92ab340e41bc494a1e7cb
author Jeremy White <jwhite@codeweavers.com> Thu Feb 10 19:03:02 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Feb 10 19:03:02 2000 +0000
tree 81977b27206072910f78832dcf1dee5b746b59c2
parent 923685ac9533a8a78928c759e14acb05abcfc2e9

Removed #include of wingdi.h and windef.h from winuser.h (and resolved
the resulting compilation failures).

windows/x11drv/clipboard.c

diff --git a/windows/x11drv/clipboard.c b/windows/x11drv/clipboard.c
index ba98d17..2eeb43d 100644
--- a/windows/x11drv/clipboard.c
+++ b/windows/x11drv/clipboard.c
@@ -52,11 +52,14 @@
 #include <errno.h>
 #include <X11/Xatom.h>
 #include <string.h>
+#include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 
 #include "ts_xlib.h"
 
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "clipboard.h"
 #include "message.h"
@@ -68,7 +71,7 @@
 #include "options.h"
 #include "debugtools.h"
 
-DEFAULT_DEBUG_CHANNEL(clipboard)
+DEFAULT_DEBUG_CHANNEL(clipboard);
 
 /* Selection masks */
 
@@ -255,10 +258,10 @@
         /* Build the debug class mask to pass to the server, by inheriting
          * the settings for the clipboard debug channel.
          */
-        dbgClasses |= __GET_DEBUGGING(__DBCL_FIXME, dbch_clipboard) ? 1 : 0;
-        dbgClasses |= __GET_DEBUGGING(__DBCL_ERR, dbch_clipboard) ? 2 : 0;
-        dbgClasses |= __GET_DEBUGGING(__DBCL_WARN, dbch_clipboard) ? 4 : 0;
-        dbgClasses |= __GET_DEBUGGING(__DBCL_TRACE, dbch_clipboard) ? 8 : 0;
+        dbgClasses |= FIXME_ON(clipboard) ? 1 : 0;
+        dbgClasses |= ERR_ON(clipboard) ? 2 : 0;
+        dbgClasses |= WARN_ON(clipboard) ? 4 : 0;
+        dbgClasses |= TRACE_ON(clipboard) ? 8 : 0;
         sprintf(dbgClassMask, "%d", dbgClasses);
 
         /* Get the clear selection preference */