Changeset 62950 in vbox

Timestamp:

Aug 4, 2016 7:08:40 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

109553

Message:

build fix

Location:

trunk/src/VBox/Devices/Graphics/shaderlib

Files:

• libWineStub/debug.c (modified) (1 diff)
• utils.c (modified) (1 diff)
• vboxext.h (modified) (1 diff)
• wined3d_private.h (modified) (2 diffs)

trunk/src/VBox/Devices/Graphics/shaderlib/libWineStub/debug.c

@@ -35 +35 @@
 # include <iprt/win/objbase.h>
 # include <wine/wined3d.h>
-# include <iprt/win/windows.h>
+# ifdef _MSC_VER
+#  include <iprt/win/windows.h>
+# else
+#  include <windows.h>
+# endif
 #else
 #include <objbase.h>

trunk/src/VBox/Devices/Graphics/shaderlib/utils.c

@@ -19 +19 @@
 #include <iprt/mem.h>
 #include <iprt/assert.h>
-#ifdef RT_OS_WINDOWS
+#ifdef _MSC_VER
 # include <iprt/win/windows.h>
 #else

trunk/src/VBox/Devices/Graphics/shaderlib/vboxext.h

@@ -21 +21 @@
 
 #ifdef VBOX_WINE_WITHOUT_LIBWINE
-# include <iprt/win/windows.h>
+# ifdef _MSC_VER
+#  include <iprt/win/windows.h>
+# else
+#  include <windows.h>
+# endif
 #endif
 

trunk/src/VBox/Devices/Graphics/shaderlib/wined3d_private.h

@@ -47 +47 @@
 #include "winuser.h"
 #else
-# include <iprt/win/windows.h>
+# ifdef _MSC_VER
+#  include <iprt/win/windows.h>
+# else
+#  include <windows.h>
+#  undef cdecl /* see windef.h */
+# endif
 #endif
 #include "wine/debug.h"
@@ -80 +85 @@
 # define VBoxTlsRefSetImpl(_tls, _val) (TlsSetValue((DWORD)(_tls), (_val)))
 # define VBoxTlsRefAssertImpl Assert
-# undef cdecl /* see windef.h */
 # include <VBox/VBoxVideo3D.h>
 #endif