Changeset 42224 in vbox for trunk/src/VBox

Timestamp:

Jul 19, 2012 10:38:00 AM (13 years ago)

Author:

vboxsync

Message:

vboxtray: 64bit build fix

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxDispIf.cpp (modified) (1 diff)
• VBoxDispIf.h (modified) (1 diff)
• VBoxDisplay.cpp (modified) (1 diff)
• VBoxTray.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp

@@ -15 +15 @@
  */
 
-#include "VBoxDispIf.h"
+#include "VBoxTray.h"
 
 #include <iprt/log.h>

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.h

@@ -16 +16 @@
 #include <iprt/cdefs.h>
 
-#include <windows.h>
 #ifdef VBOX_WITH_WDDM
 # define D3DKMDT_SPECIAL_MULTIPLATFORM_TOOL

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp

@@ -16 +16 @@
  */
 #define _WIN32_WINNT 0x0500
-#include <windows.h>
 #include "VBoxTray.h"
 #include "VBoxHelpers.h"

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.h

@@ -19 +19 @@
 #define ___VBOXTRAY_H
 
+#       define _InterlockedExchange           _InterlockedExchange_StupidDDKVsCompilerCrap
+#       define _InterlockedExchangeAdd        _InterlockedExchangeAdd_StupidDDKVsCompilerCrap
+#       define _InterlockedCompareExchange    _InterlockedCompareExchange_StupidDDKVsCompilerCrap
+#       define _InterlockedAddLargeStatistic  _InterlockedAddLargeStatistic_StupidDDKVsCompilerCrap
+#       define _interlockedbittestandset      _interlockedbittestandset_StupidDDKVsCompilerCrap
+#       define _interlockedbittestandreset    _interlockedbittestandreset_StupidDDKVsCompilerCrap
+#       define _interlockedbittestandset64    _interlockedbittestandset64_StupidDDKVsCompilerCrap
+#       define _interlockedbittestandreset64  _interlockedbittestandreset64_StupidDDKVsCompilerCrap
+#       pragma warning(disable : 4163)
 #include <windows.h>
+#       pragma warning(default : 4163)
+#       undef  _InterlockedExchange
+#       undef  _InterlockedExchangeAdd
+#       undef  _InterlockedCompareExchange
+#       undef  _InterlockedAddLargeStatistic
+#       undef  _interlockedbittestandset
+#       undef  _interlockedbittestandreset
+#       undef  _interlockedbittestandset64
+#       undef  _interlockedbittestandreset64
+
 #include <tchar.h>
 #include <stdio.h>