Changeset 55644 in vbox for trunk/src/VBox/Main/include

Timestamp:

May 4, 2015 1:27:35 PM (10 years ago)

Author:

vboxsync

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

100019

Message:

Main: Made it compile without VBOX_WITH_GUEST_CONTROL.

Location:

trunk/src/VBox/Main/include

Files:

• GuestCtrlImplPrivate.h (modified) (1 diff)
• GuestImpl.h (modified) (7 diffs)

trunk/src/VBox/Main/include/GuestCtrlImplPrivate.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
  * Internal helpers/structures for guest control functionality.
  */

trunk/src/VBox/Main/include/GuestImpl.h

@@ -27 +27 @@
 
 #include "AdditionsFacilityImpl.h"
-#include "GuestCtrlImplPrivate.h"
+#ifdef VBOX_WITH_GUEST_CONTROL
+# include "GuestCtrlImplPrivate.h"
+# include "GuestSessionImpl.h"
+#endif
 #ifdef VBOX_WITH_DRAG_AND_DROP
 # include "GuestDnDSourceImpl.h"
 # include "GuestDnDTargetImpl.h"
 #endif
-#include "GuestSessionImpl.h"
+#include "EventImpl.h"
 #include "HGCM.h"
 
@@ -72 +75 @@
     /** Static callback for handling guest control notifications. */
     static DECLCALLBACK(int) i_notifyCtrlDispatcher(void *pvExtension, uint32_t u32Function, void *pvData, uint32_t cbData);
+#endif
     static DECLCALLBACK(void) i_staticUpdateStats(RTTIMERLR hTimerLR, void *pvUser, uint64_t iTick);
-#endif
     /** @}  */
 
@@ -96 +99 @@
         return setErrorInternal(aResultCode, getStaticClassIID(), getStaticComponentName(), aText, false, true);
     }
-#ifdef VBOX_WITH_GUEST_CONTROL
-    int         i_dispatchToSession(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb);
     uint32_t    i_getAdditionsVersion(void) { return mData.mAdditionsVersionFull; }
     VBOXOSTYPE  i_getGuestOSType(void) { return mData.mOSType; }
+#ifdef VBOX_WITH_GUEST_CONTROL
+    int         i_dispatchToSession(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb);
     int         i_sessionRemove(GuestSession *pSession);
     int         i_sessionCreate(const GuestSessionStartupInfo &ssInfo, const GuestCredentials &guestCreds,
@@ -174 +177 @@
     typedef std::map< AdditionsFacilityType_T, ComObjPtr<AdditionsFacility> >::const_iterator FacilityMapIterConst;
 
+#ifdef VBOX_WITH_GUEST_CONTROL
     /** Map for keeping the guest sessions. The primary key marks the guest session ID. */
     typedef std::map <uint32_t, ComObjPtr<GuestSession> > GuestSessions;
+#endif
 
     struct Data
@@ -192 +197 @@
         uint32_t                    mAdditionsFeatures;
         Utf8Str                     mInterfaceVersion;
+#ifdef VBOX_WITH_GUEST_CONTROL
         GuestSessions               mGuestSessions;
         uint32_t                    mNextSessionID;
+#endif
     } mData;
 
@@ -208 +215 @@
     const ComObjPtr<Console>        mParent;
 
-#ifdef VBOX_WITH_GUEST_CONTROL
     /**
      * This can safely be used without holding any locks.
@@ -215 +221 @@
      */
     const ComObjPtr<EventSource>    mEventSource;
+#ifdef VBOX_WITH_GUEST_CONTROL
     /** General extension callback for guest control. */
     HGCMSVCEXTHANDLE                mhExtCtrl;