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).

controls/button.c

diff --git a/controls/button.c b/controls/button.c
index fb958e5..d51d190 100644
--- a/controls/button.c
+++ b/controls/button.c
@@ -8,6 +8,8 @@
 #include <string.h>
 #include "win.h"
 #include "button.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "tweak.h"
 

controls/combo.c

diff --git a/controls/combo.c b/controls/combo.c
index 8ff6333..0940de2 100644
--- a/controls/combo.c
+++ b/controls/combo.c
@@ -9,8 +9,9 @@
 #include <string.h>
 
 #include "winbase.h"
-#include "winuser.h"
+#include "windef.h"
 #include "wingdi.h"
+#include "winuser.h"
 #include "wine/winuser16.h"
 #include "win.h"
 #include "spy.h"

controls/desktop.c

diff --git a/controls/desktop.c b/controls/desktop.c
index c170f2c..78e2abe 100644
--- a/controls/desktop.c
+++ b/controls/desktop.c
@@ -10,6 +10,7 @@
 
 #include "desktop.h"
 #include "windef.h"
+#include "wingdi.h"
 #include "heap.h"
 #include "monitor.h"
 #include "win.h"

controls/icontitle.c

diff --git a/controls/icontitle.c b/controls/icontitle.c
index 006ffc6..9e657b7 100644
--- a/controls/icontitle.c
+++ b/controls/icontitle.c
@@ -7,6 +7,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "wine/winuser16.h"
 #include "win.h"

controls/listbox.c

diff --git a/controls/listbox.c b/controls/listbox.c
index bebcb00..3a1ea7b 100644
--- a/controls/listbox.c
+++ b/controls/listbox.c
@@ -6,6 +6,9 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "wine/winbase16.h"
 #include "winuser.h"
@@ -18,8 +21,8 @@
 #include "debugtools.h"
 #include "tweak.h"
 
-DEFAULT_DEBUG_CHANNEL(listbox)
-DECLARE_DEBUG_CHANNEL(combo)
+DEFAULT_DEBUG_CHANNEL(listbox);
+DECLARE_DEBUG_CHANNEL(combo);
 
 /* Unimplemented yet:
  * - LBS_NOSEL

controls/menu.c

diff --git a/controls/menu.c b/controls/menu.c
index a2f5aba..a277ecb 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -17,9 +17,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "win.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
+#include "win.h"
 #include "task.h"
 #include "heap.h"
 #include "menu.h"

controls/scroll.c

diff --git a/controls/scroll.c b/controls/scroll.c
index 901873f..6748222 100644
--- a/controls/scroll.c
+++ b/controls/scroll.c
@@ -5,6 +5,8 @@
  * Copyright 1994, 1996 Alexandre Julliard
  */
 
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "scroll.h"
 #include "heap.h"

controls/static.c

diff --git a/controls/static.c b/controls/static.c
index f67467c..48b19e5 100644
--- a/controls/static.c
+++ b/controls/static.c
@@ -5,6 +5,8 @@
  *
  */
 
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "win.h"
 #include "cursoricon.h"

controls/uitools.c

diff --git a/controls/uitools.c b/controls/uitools.c
index 30870a0..82ca1d3 100644
--- a/controls/uitools.c
+++ b/controls/uitools.c
@@ -5,6 +5,8 @@
  * Copyright 1997 Bertho A. Stultiens
  */
 
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "winuser.h"
 #include "debugtools.h"