Changeset 69783 in vbox for trunk/src/VBox/Main/src-server/win/svcmain.cpp

Timestamp:

Nov 20, 2017 6:58:25 PM (7 years ago)

Author:

vboxsync

Message:

Main: SDS plan B it is.

File:

• trunk/src/VBox/Main/src-server/win/svcmain.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/win/svcmain.cpp

@@ -78 +78 @@
 HWND        g_hMainWindow = NULL;
 HINSTANCE   g_hInstance   = NULL;
-#ifdef VBOX_WITH_SDS_PLAN_B
+#ifdef VBOX_WITH_SDS
 /** This is set if we're connected to SDS and should discount a server lock
  * that it is holding when deciding whether we're idle or not. */
@@ -121 +121 @@
 /*static*/ bool CExeModule::isIdleLockCount(LONG cLocks)
 {
-#ifdef VBOX_WITH_SDS_PLAN_B
+#ifdef VBOX_WITH_SDS
     if (g_fRegisteredWithVBoxSDS)
         return cLocks <= 1;
@@ -185 +185 @@
 
 
-#ifdef VBOX_WITH_SDS_PLAN_B
+#ifdef VBOX_WITH_SDS
 class VBoxSVCRegistration;
 
@@ -473 +473 @@
 }
 
-#endif /* VBOX_WITH_SDS_PLAN_B */
+#endif /* VBOX_WITH_SDS */
 
 
@@ -807 +807 @@
                                     RTLOGFLAGS_PREFIX_THREAD | RTLOGFLAGS_PREFIX_TIME_PROG,
                                     VBOXSVC_LOG_DEFAULT, "VBOXSVC_RELEASE_LOG",
-#ifdef VBOX_WITH_SDS_PLAN_B
+#ifdef VBOX_WITH_SDS
                                     RTLOGDEST_FILE | RTLOGDEST_F_DELAY_FILE,
 #else