[WINED3D]

[reactos.git] / reactos / dll / directx / wine / wined3d / wined3d_private.h

diff --git a/reactos/dll/directx/wine/wined3d/wined3d_private.h b/reactos/dll/directx/wine/wined3d/wined3d_private.h
index db075cc..17988f7 100644 (file)
--- a/reactos/dll/directx/wine/wined3d/wined3d_private.h
+++ b/reactos/dll/directx/wine/wined3d/wined3d_private.h
@@ -25,9 +25,8 @@
 #ifndef __WINE_WINED3D_PRIVATE_H
 #define __WINE_WINED3D_PRIVATE_H
 
 #ifndef __WINE_WINED3D_PRIVATE_H
 #define __WINE_WINED3D_PRIVATE_H
 

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

 
 #ifdef USE_WIN32_OPENGL
 #define WINE_GLAPI __stdcall
 
 #ifdef USE_WIN32_OPENGL
 #define WINE_GLAPI __stdcall


@@ -35,25 +34,31 @@
 #define WINE_GLAPI
 #endif
 
 #define WINE_GLAPI
 #endif
 

-#include <stdarg.h>
-#include <math.h>
-//#include <limits.h>
+#ifdef HAVE_FLOAT_H
+# include <float.h>
+#endif
+
+#include <stdio.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+

 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #define COBJMACROS

+

 #include <windef.h>
 #include <windef.h>

-//#include "winbase.h"
-#include <winreg.h>
+#include <winbase.h>

 #include <wingdi.h>
 #include <winuser.h>
 #include <wingdi.h>
 #include <winuser.h>

-#include <wine/debug.h>
-#include <wine/unicode.h>
-

 #include <objbase.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/list.h>
 #include <wine/rbtree.h>

+#include <wine/wined3d.h>
+#include "wined3d_gl.h"

 #include <wine/wgl_driver.h>
 
 /* Driver quirks */
 #include <wine/wgl_driver.h>
 
 /* Driver quirks */


@@ -2999,4 +3004,4 @@ static inline void context_apply_state(struct wined3d_context *context,
 
 #define MAKEDWORD_VERSION(maj, min) (((maj & 0xffff) << 16) | (min & 0xffff))
 
 
 #define MAKEDWORD_VERSION(maj, min) (((maj & 0xffff) << 16) | (min & 0xffff))
 

-#endif
+#endif /* __WINE_WINED3D_PRIVATE_H */