[OPENGL32]

* Move wine/debug.h inclusion to the main header.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61729

diff --git a/reactos/dll/opengl/opengl32/icdload.c b/reactos/dll/opengl/opengl32/icdload.c
index 1cd1e19..f4029cf 100644 (file)
--- a/reactos/dll/opengl/opengl32/icdload.c
+++ b/reactos/dll/opengl/opengl32/icdload.c
@@ -6,9 +6,9 @@
  */
 
 #include "opengl32.h"
+
 #include <winreg.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(opengl32);
 
 struct Drv_Opengl_Info

diff --git a/reactos/dll/opengl/opengl32/opengl32.h b/reactos/dll/opengl/opengl32/opengl32.h
index c210997..72862f6 100644 (file)
--- a/reactos/dll/opengl/opengl32/opengl32.h
+++ b/reactos/dll/opengl/opengl32/opengl32.h
@@ -16,6 +16,8 @@
 #include <winddi.h>
 #include <GL/gl.h>
 
+#include <wine/debug.h>
+
 #include "icd.h"
 
 struct wgl_context

diff --git a/reactos/dll/opengl/opengl32/swimpl.c b/reactos/dll/opengl/opengl32/swimpl.c
index 9a26dfc..3fb164f 100644 (file)
--- a/reactos/dll/opengl/opengl32/swimpl.c
+++ b/reactos/dll/opengl/opengl32/swimpl.c
@@ -9,7 +9,6 @@
 
 /* MESA includes */
 #include <main/context.h>
-#include <main/formats.h>
 #include <main/framebuffer.h>
 #include <main/renderbuffer.h>
 #include <main/shared.h>
@@ -17,13 +16,11 @@
 #include <swrast/s_context.h>
 #include <swrast/s_renderbuffer.h>
 #include <swrast_setup/swrast_setup.h>
-#include <tnl/t_context.h>
 #include <tnl/t_pipeline.h>
 #include <tnl/tnl.h>
 #include <drivers/common/driverfuncs.h>
 #include <drivers/common/meta.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(opengl32);
 
 #define WIDTH_BYTES_ALIGN32(cx, bpp) ((((cx) * (bpp) + 31) & ~31) >> 3)

diff --git a/reactos/dll/opengl/opengl32/wgl.c b/reactos/dll/opengl/opengl32/wgl.c
index f312f11..32503e7 100644 (file)
--- a/reactos/dll/opengl/opengl32/wgl.c
+++ b/reactos/dll/opengl/opengl32/wgl.c
@@ -9,7 +9,6 @@
 
 #include <pseh/pseh2.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(wgl);
 
 static CRITICAL_SECTION dc_data_cs = {NULL, -1, 0, 0, 0, 0};

diff --git a/reactos/dll/opengl/opengl32/wgl_font.c b/reactos/dll/opengl/opengl32/wgl_font.c
index c4c2ca6..95d01cf 100644 (file)
--- a/reactos/dll/opengl/opengl32/wgl_font.c
+++ b/reactos/dll/opengl/opengl32/wgl_font.c
@@ -21,7 +21,7 @@
 #include "opengl32.h"
 
 #include <math.h>
-#include <wine/debug.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(wgl);
 
 /***********************************************************************