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

tools/bin2res.c

diff --git a/tools/bin2res.c b/tools/bin2res.c
index b121da0..0218f24 100644
--- a/tools/bin2res.c
+++ b/tools/bin2res.c
@@ -26,6 +26,8 @@
 #ifdef HAVE_SYS_MMAN_H
 # include <sys/mman.h>
 #endif
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 
 extern char*   g_lpstrFileName;

tools/fnt2bdf.c

diff --git a/tools/fnt2bdf.c b/tools/fnt2bdf.c
index 0f16919..c38fbd6 100644
--- a/tools/fnt2bdf.c
+++ b/tools/fnt2bdf.c
@@ -19,6 +19,8 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "fnt2bdf.h"
 #include "neexe.h"

tools/wrc/genres.c

diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c
index 80ca457..0d527a3 100644
--- a/tools/wrc/genres.c
+++ b/tools/wrc/genres.c
@@ -18,6 +18,8 @@
 #include "wrc.h"
 #include "genres.h"
 #include "utils.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 
 #define SetResSize(res, tag)	*(DWORD *)&((res)->data[(tag)]) = \

tools/wrc/parser.y

diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y
index 29e31f6..fb0de3f 100644
--- a/tools/wrc/parser.y
+++ b/tools/wrc/parser.y
@@ -106,6 +106,8 @@
 #include "dumpres.h"
 #include "preproc.h"
 #include "parser.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 
 #ifdef __BORLANDC__