Commit 294c8af6 authored by Alexandre Julliard's avatar Alexandre Julliard

Removed some unnecessary inclusions of gdi.h.

parent f20ce3b8
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "wine/port.h"
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
...@@ -30,8 +31,8 @@ ...@@ -30,8 +31,8 @@
#include "wgl.h" #include "wgl.h"
#include "opengl_ext.h" #include "opengl_ext.h"
#include "wine/library.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/port.h"
WINE_DEFAULT_DEBUG_CHANNEL(opengl); WINE_DEFAULT_DEBUG_CHANNEL(opengl);
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifndef __DLLS_OPENGL32_WGL_H #ifndef __DLLS_OPENGL32_WGL_H
#define __DLLS_OPENGL32_WGL_H #define __DLLS_OPENGL32_WGL_H
#include "gdi.h" #include "wingdi.h"
typedef void *HGLRC; typedef void *HGLRC;
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <string.h> #include <string.h>
#include "gdi.h"
#include "ttydrv.h" #include "ttydrv.h"
#include "winbase.h" #include "winbase.h"
#include "wine/debug.h" #include "wine/debug.h"
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "gdi.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "ttydrv.h" #include "ttydrv.h"
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include "config.h" #include "config.h"
#include "gdi.h"
#include "ttydrv.h" #include "ttydrv.h"
#include "wine/debug.h" #include "wine/debug.h"
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "dinput.h" #include "dinput.h"
#include "gdi.h"
#include "ttydrv.h" #include "ttydrv.h"
#include "wine/debug.h" #include "wine/debug.h"
......
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
#include "config.h" #include "config.h"
#include "gdi.h"
#include "ttydrv.h" #include "ttydrv.h"
#include "win.h" #include "win.h"
#include "winpos.h" #include "winpos.h"
#include "wownt32.h" #include "wownt32.h"
#include "wine/wingdi16.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(ttydrv); WINE_DEFAULT_DEBUG_CHANNEL(ttydrv);
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include "wingdi.h" #include "wingdi.h"
#include "winspool.h" #include "winspool.h"
#include "gdi.h"
#include "psdrv.h" #include "psdrv.h"
#include "wine/debug.h" #include "wine/debug.h"
......
...@@ -18,7 +18,11 @@ ...@@ -18,7 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "gdi.h" #include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "psdrv.h" #include "psdrv.h"
#include "wine/debug.h" #include "wine/debug.h"
......
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h" #include "winreg.h"
#include "wine/wingdi16.h"
#include "win.h" #include "win.h"
#include "x11drv.h" #include "x11drv.h"
#include "wine/debug.h" #include "wine/debug.h"
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <stdio.h> #include <stdio.h>
#include "gdi.h"
#include "x11drv.h" #include "x11drv.h"
#include "wine/debug.h" #include "wine/debug.h"
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "winbase.h" #include "winbase.h"
#include "x11drv.h" #include "x11drv.h"
#include "x11font.h" #include "x11font.h"
#include "gdi.h"
#include "ddrawi.h" #include "ddrawi.h"
#include "wine/debug.h" #include "wine/debug.h"
......
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "gdi.h"
#include "x11drv.h" #include "x11drv.h"
#include "wine/library.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(opengl); WINE_DEFAULT_DEBUG_CHANNEL(opengl);
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include "winuser.h" #include "winuser.h"
#include "winerror.h" #include "winerror.h"
#include "wownt32.h" #include "wownt32.h"
#include "wine/wingdi16.h"
#include "x11drv.h" #include "x11drv.h"
#include "win.h" #include "win.h"
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "windef.h" #include "windef.h"
#include "x11drv.h" #include "x11drv.h"
#include "wine/library.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wintab.h" #include "wintab.h"
......
...@@ -40,7 +40,6 @@ typedef int Status; ...@@ -40,7 +40,6 @@ typedef int Status;
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "gdi.h"
#include "user.h" #include "user.h"
#include "win.h" #include "win.h"
#include "ddrawi.h" #include "ddrawi.h"
...@@ -87,7 +86,7 @@ typedef struct tagXRENDERINFO *XRENDERINFO; ...@@ -87,7 +86,7 @@ typedef struct tagXRENDERINFO *XRENDERINFO;
typedef struct typedef struct
{ {
HDC hdc; HDC hdc;
DC *dc; /* direct pointer to DC, should go away */ struct tagDC *dc; /* direct pointer to DC, should go away */
GC gc; /* X Window GC */ GC gc; /* X Window GC */
Drawable drawable; Drawable drawable;
POINT org; /* DC origin relative to drawable */ POINT org; /* DC origin relative to drawable */
......
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "winreg.h" #include "winreg.h"
#include "gdi.h"
#include "user.h" #include "user.h"
#include "win.h" #include "win.h"
#include "x11drv.h" #include "x11drv.h"
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#ifndef __WINE_X11FONT_H #ifndef __WINE_X11FONT_H
#define __WINE_X11FONT_H #define __WINE_X11FONT_H
#include "gdi.h" #include "wine/wingdi16.h"
#include "x11drv.h" #include "x11drv.h"
#include "pshpack1.h" #include "pshpack1.h"
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <math.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment