Changeset 7233 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 3, 2008 12:25:32 PM (17 years ago)

Author:

vboxsync

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

28565

Message:

Renamed OSType to VBOXOSTYPE to fix the clash with some mac os x typedef.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxBFE/SDLConsole.cpp (modified) (1 diff)
• VirtualBox/include/VBoxConsoleView.h (modified) (1 diff)
• VirtualBox/src/VBoxGlobal.cpp (modified) (1 diff)
• VirtualBox4/include/VBoxConsoleView.h (modified) (1 diff)
• VirtualBox4/src/VBoxGlobal.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxBFE/SDLConsole.cpp ¶

@@ -23 +23 @@
 #ifdef RT_OS_DARWIN
 # include <Carbon/Carbon.h>
-# define OSType VBoxOSType
 # undef PAGE_SIZE
 # undef PAGE_SHIFT

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleView.h ¶

@@ -40 +40 @@
 # include <Carbon/Carbon.h>
 # include "DarwinCursor.h"
-/** @todo remove this hack when somebody get around fixing the conflicting typedef/enum OSType. */
-# define OSType VBoxOSType
 #endif
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp ¶

@@ -3596 +3596 @@
      *       succeeded. */
     ICInstance icInstance;
-    OSType psiSignature = 'psi ';
+    VBOXOSTYPE psiSignature = 'psi ';
     OSStatus error = ::ICStart (&icInstance, psiSignature);
     if (error == noErr)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxConsoleView.h ¶

@@ -45 +45 @@
 # include <Carbon/Carbon.h>
 # include "DarwinCursor.h"
-/** @todo remove this hack when somebody get around fixing the conflicting typedef/enum OSType. */
-# define OSType VBoxOSType
 #endif
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp ¶

@@ -3602 +3602 @@
      *       succeeded. */
     ICInstance icInstance;
-    OSType psiSignature = 'psi ';
+    VBOXOSTYPE psiSignature = 'psi ';
     OSStatus error = ::ICStart (&icInstance, psiSignature);
     if (error == noErr)