[akhaldi] 61729: [OPENGL32] * Move wine/debug.h inclusion to the main header. * Improve header inclusions. CORE-7716

Author: akhaldi
Date: Mon Jan 20 13:07:26 2014
New Revision: 61729

URL: http://svn.reactos.org/svn/reactos?rev=61729&view=rev
Log:
[OPENGL32]
* Move wine/debug.h inclusion to the main header.
* Improve header inclusions.
CORE-7716

Modified:
    trunk/reactos/dll/opengl/opengl32/icdload.c
    trunk/reactos/dll/opengl/opengl32/opengl32.h
    trunk/reactos/dll/opengl/opengl32/swimpl.c
    trunk/reactos/dll/opengl/opengl32/wgl.c
    trunk/reactos/dll/opengl/opengl32/wgl_font.c

Modified: trunk/reactos/dll/opengl/opengl32/icdload.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/icdloa…
==============================================================================
--- trunk/reactos/dll/opengl/opengl32/icdload.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/opengl/opengl32/icdload.c	[iso-8859-1] Mon Jan 20 13:07:26 2014
@@ -6,9 +6,9 @@
  */
 
 #include "opengl32.h"
+
 #include <winreg.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(opengl32);
 
 struct Drv_Opengl_Info

Modified: trunk/reactos/dll/opengl/opengl32/opengl32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/opengl…
==============================================================================
--- trunk/reactos/dll/opengl/opengl32/opengl32.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/opengl/opengl32/opengl32.h	[iso-8859-1] Mon Jan 20 13:07:26 2014
@@ -15,6 +15,8 @@
 #include <wingdi.h>
 #include <winddi.h>
 #include <GL/gl.h>
+
+#include <wine/debug.h>
 
 #include "icd.h"
 

Modified: trunk/reactos/dll/opengl/opengl32/swimpl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/swimpl…
==============================================================================
--- trunk/reactos/dll/opengl/opengl32/swimpl.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/opengl/opengl32/swimpl.c	[iso-8859-1] Mon Jan 20 13:07:26 2014
@@ -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)

Modified: trunk/reactos/dll/opengl/opengl32/wgl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/wgl.c?…
==============================================================================
--- trunk/reactos/dll/opengl/opengl32/wgl.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/opengl/opengl32/wgl.c	[iso-8859-1] Mon Jan 20 13:07:26 2014
@@ -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};

Modified: trunk/reactos/dll/opengl/opengl32/wgl_font.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/wgl_fo…
==============================================================================
--- trunk/reactos/dll/opengl/opengl32/wgl_font.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/opengl/opengl32/wgl_font.c	[iso-8859-1] Mon Jan 20 13:07:26 2014
@@ -21,7 +21,7 @@
 #include "opengl32.h"
 
 #include <math.h>
-#include <wine/debug.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(wgl);
 
 /***********************************************************************