Module: wine Branch: master Commit: 1ac23b9b0f905788ebcca7cc3bb34735b488d85b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ac23b9b0f905788ebcca7cc3b...
Author: Alexandre Julliard julliard@winehq.org Date: Sat Dec 5 11:45:31 2009 +0100
gdi32: Don't include wingdi16.h by default.
---
dlls/gdi32/bidi.c | 1 + dlls/gdi32/driver.c | 1 + dlls/gdi32/enhmetafile.c | 1 + dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/freetype.c | 1 + dlls/gdi32/gdi_main.c | 1 + dlls/gdi32/gdi_private.h | 5 ++++- dlls/gdi32/gdiobj.c | 1 + dlls/gdi32/metafile.c | 2 ++ dlls/gdi32/mfdrv/graphics.c | 5 +++++ dlls/gdi32/mfdrv/init.c | 1 + dlls/gdi32/mfdrv/mapping.c | 4 ++++ dlls/gdi32/mfdrv/objects.c | 1 + dlls/gdi32/mfdrv/text.c | 1 + dlls/gdi32/printdrv.c | 1 + 15 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 9ac5e1d..7d7f6bc 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -46,6 +46,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winnls.h" #include "wine/debug.h" #include "gdi_private.h"
diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 41c59c7..635eeb8 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "winreg.h" #include "ddrawgdi.h" +#include "wine/winbase16.h"
#include "gdi_private.h" #include "wine/unicode.h" diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 25b3389..35fd7cf 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -43,6 +43,7 @@ #include "wingdi.h" #include "winnls.h" #include "winerror.h" +#include "wine/wingdi16.h" #include "gdi_private.h" #include "wine/debug.h"
diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index bc53493..115bb39 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winnls.h" #include "gdi_private.h" #include "enhmfdrv/enhmetafiledrv.h" #include "wine/debug.h" diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9b5f44f..ed37a25 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -84,6 +84,7 @@ #include "winreg.h" #include "wingdi.h" #include "gdi_private.h" +#include "wine/library.h" #include "wine/unicode.h" #include "wine/debug.h" #include "wine/list.h" diff --git a/dlls/gdi32/gdi_main.c b/dlls/gdi32/gdi_main.c index 6734ed5..b757ac0 100644 --- a/dlls/gdi32/gdi_main.c +++ b/dlls/gdi32/gdi_main.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "wine/winbase16.h" #include "gdi_private.h"
/*********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 7b565c9..670ef41 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -22,7 +22,10 @@ #define __WINE_GDI_PRIVATE_H
#include <math.h> -#include "wine/wingdi16.h" +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h"
/* Metafile defines */ #define META_EOF 0x0000 diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 6ba4a4c..245b1cc 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "wingdi.h" #include "winreg.h" +#include "winnls.h" #include "winerror.h" #include "winternl.h"
diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 27ce7b5..6083635 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -55,7 +55,9 @@ #include "winbase.h" #include "wingdi.h" #include "winreg.h" +#include "winnls.h" #include "winternl.h" +#include "wine/wingdi16.h" #include "gdi_private.h" #include "wine/debug.h"
diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index 9b92f85..ea384ba 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -18,9 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include <stdarg.h> #include <stdlib.h> #include <string.h>
+#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "wine/wingdi16.h" #include "mfdrv/metafiledrv.h" #include "wine/debug.h"
diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 4c88ac6..f515bcf 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -23,6 +23,7 @@
#include "windef.h" #include "winbase.h" +#include "winnls.h" #include "gdi_private.h" #include "mfdrv/metafiledrv.h" #include "wine/debug.h" diff --git a/dlls/gdi32/mfdrv/mapping.c b/dlls/gdi32/mfdrv/mapping.c index 998a7a1..f306cc6 100644 --- a/dlls/gdi32/mfdrv/mapping.c +++ b/dlls/gdi32/mfdrv/mapping.c @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" #include "gdi_private.h" #include "mfdrv/metafiledrv.h"
diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index e74cde8..a7a442b 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "wingdi.h" #include "wownt32.h" +#include "wine/wingdi16.h" #include "mfdrv/metafiledrv.h" #include "gdi_private.h" #include "wine/debug.h" diff --git a/dlls/gdi32/mfdrv/text.c b/dlls/gdi32/mfdrv/text.c index c3c182c..3ec3703 100644 --- a/dlls/gdi32/mfdrv/text.c +++ b/dlls/gdi32/mfdrv/text.c @@ -23,6 +23,7 @@
#include "windef.h" #include "winbase.h" +#include "wine/wingdi16.h" #include "mfdrv/metafiledrv.h" #include "wine/debug.h"
diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index 18f9db7..cc1e61f 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winnls.h" #include "winspool.h" #include "winerror.h" #include "wine/debug.h"