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

Timestamp:

May 17, 2018 12:49:06 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9049: Adjusting ifdefs for main.cpp, some stuff is used by non-hardened code of hardened build.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/main.cpp (modified) (4 diffs)

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

@@ -39 +39 @@
 # ifdef VBOX_WITH_HARDENING
 #  include <VBox/sup.h>
-# else /* !VBOX_WITH_HARDENING */
+# endif
+# if !defined(VBOX_WITH_HARDENING) || defined(VBOX_GUI_WITH_SHARED_LIBRARY) && !defined(VBOX_RUNTIME_UI)
 #  include <iprt/initterm.h>
 #  ifdef VBOX_WS_MAC
 #   include <iprt/asm.h>
-#  endif /* VBOX_WS_MAC */
-# endif /* !VBOX_WITH_HARDENING */
+#  endif
+# endif
 # ifdef VBOX_WS_X11
 #  include <iprt/env.h>
-# endif /* VBOX_WS_X11 */
+# endif
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -516 +517 @@
 }
 
-#ifndef VBOX_WITH_HARDENING
+#if !defined(VBOX_WITH_HARDENING) || defined(VBOX_GUI_WITH_SHARED_LIBRARY) && !defined(VBOX_RUNTIME_UI)
 
 int main(int argc, char **argv, char **envp)
@@ -611 +612 @@
 }
 
-#else  /* VBOX_WITH_HARDENING */
-
+#endif
+
+#ifdef VBOX_WITH_HARDENING
 
 /**
@@ -731 +733 @@
 
 #endif /* VBOX_WITH_HARDENING */
-