From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 20 Jan 2014 12:57:33 +0000 (+0000)
Subject: [WINED3D]
X-Git-Tag: ReactOS-0.3.16~144
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=19f2e502587dd724f79edbb075896037e74ed079;hp=ba47e91e6f021787d59f23b0683e2447ae73556b;ds=sidebyside

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

svn path=/trunk/; revision=61727
---

diff --git a/reactos/dll/directx/wine/wined3d/directx.c b/reactos/dll/directx/wine/wined3d/directx.c
index 2c104a82c1d..420de71d486 100644
--- a/reactos/dll/directx/wine/wined3d/directx.c
+++ b/reactos/dll/directx/wine/wined3d/directx.c
@@ -23,6 +23,8 @@
 
 #include "wined3d_private.h"
 
+#include <wine/unicode.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);
 
diff --git a/reactos/dll/directx/wine/wined3d/wined3d_main.c b/reactos/dll/directx/wine/wined3d/wined3d_main.c
index 225723abb2f..6eab4aec14f 100644
--- a/reactos/dll/directx/wine/wined3d/wined3d_main.c
+++ b/reactos/dll/directx/wine/wined3d/wined3d_main.c
@@ -24,6 +24,8 @@
 
 #include "wined3d_private.h"
 
+#include <winreg.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 WINE_DECLARE_DEBUG_CHANNEL(winediag);
 
diff --git a/reactos/dll/directx/wine/wined3d/wined3d_private.h b/reactos/dll/directx/wine/wined3d/wined3d_private.h
index d425a5edd6a..17988f76ad7 100644
--- a/reactos/dll/directx/wine/wined3d/wined3d_private.h
+++ b/reactos/dll/directx/wine/wined3d/wined3d_private.h
@@ -25,13 +25,9 @@
 #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
 #else
@@ -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 <wine/debug.h>
-#include <wine/unicode.h>
-
 #include <objbase.h>
-#include <wine/wined3d.h>
-#include "wined3d_gl.h"
+
+#include <wine/debug.h>
 #include <wine/list.h>
 #include <wine/rbtree.h>
+#include <wine/wined3d.h>
+#include "wined3d_gl.h"
 #include <wine/wgl_driver.h>
 
 /* Driver quirks */
@@ -3006,4 +3004,4 @@ static inline void context_apply_state(struct wined3d_context *context,
 
 #define MAKEDWORD_VERSION(maj, min) (((maj & 0xffff) << 16) | (min & 0xffff))
 
-#endif
+#endif /* __WINE_WINED3D_PRIVATE_H */