[akhaldi] 61727: [WINED3D] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716

Author: akhaldi
Date: Mon Jan 20 12:57:33 2014
New Revision: 61727

URL: http://svn.reactos.org/svn/reactos?rev=61727&view=rev
Log:
[WINED3D]
* Remove one time inclusions from the main header and put them back where they belong.
* Cleanup the main header.
CORE-7716

Modified:
    trunk/reactos/dll/directx/wine/wined3d/directx.c
    trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c
    trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h

Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/di...
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/directx.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/directx.c	[iso-8859-1] Mon Jan 20 12:57:33 2014
@@ -22,6 +22,8 @@
  */

#include "wined3d_private.h"
+
+#include <wine/unicode.h>

WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);

Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/wi...
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c	[iso-8859-1] Mon Jan 20 12:57:33 2014
@@ -24,6 +24,8 @@

#include "wined3d_private.h"

+#include <winreg.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 WINE_DECLARE_DEBUG_CHANNEL(winediag);

Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/wi...
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h	[iso-8859-1] Mon Jan 20 12:57:33 2014
@@ -25,12 +25,8 @@
 #ifndef __WINE_WINED3D_PRIVATE_H
 #define __WINE_WINED3D_PRIVATE_H

-#include <config.h>
+#include <wine/config.h>
 #include <wine/port.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H

#ifdef USE_WIN32_OPENGL
 #define WINE_GLAPI __stdcall
@@ -42,25 +38,27 @@
 # include <float.h>
 #endif

-#include <stdarg.h>
 #include <stdio.h>
-#include <math.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #define COBJMACROS
+
 #include <windef.h>
 #include <winbase.h>
-#include <winreg.h>
 #include <wingdi.h>
 #include <winuser.h>
+#include <objbase.h>
+
 #include <wine/debug.h>
-#include <wine/unicode.h>
-
-#include <objbase.h>
+#include <wine/list.h>
+#include <wine/rbtree.h>
 #include <wine/wined3d.h>
 #include "wined3d_gl.h"
-#include <wine/list.h>
-#include <wine/rbtree.h>
 #include <wine/wgl_driver.h>

/* Driver quirks */
@@ -3006,4 +3004,4 @@

#define MAKEDWORD_VERSION(maj, min) (((maj & 0xffff) << 16) | (min & 0xffff))

-#endif
+#endif /* __WINE_WINED3D_PRIVATE_H */