Changeset 23233 in vbox

Timestamp:

Sep 22, 2009 5:07:56 PM (15 years ago)

Author:

vboxsync

Message:

medium-merge: fix osx

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxSettingsDialogSpecific.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSettingsDialogSpecific.cpp

@@ -22 +22 @@
 
 // #define ENABLE_GLOBAL_USB
+/* @todo: poetzsch: This includes somehow AssertMacros.h on Mac OS X, which
+ * defines a macro "check". This name is also used in a Qt class. Have to look
+ * at this in detail later */
+#include "VBoxVMSettingsHD.h"
 
 #include "VBoxSettingsDialogSpecific.h"
@@ -38 +42 @@
 #include "VBoxVMSettingsSystem.h"
 #include "VBoxVMSettingsDisplay.h"
-#include "VBoxVMSettingsHD.h"
 #include "VBoxVMSettingsAudio.h"
 #include "VBoxVMSettingsNetwork.h"