Changeset 80638 in vbox

Timestamp:

Sep 6, 2019 5:06:51 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard: Build fix.

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxSharedClipboardSvc-internal.h (modified) (2 diffs)
• VBoxSharedClipboardSvc.cpp (modified) (2 diffs)

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-internal.h

@@ -26 +26 @@
 #include <map>
 
+#include <iprt/cpp/list.h> /* For RTCList. */
 #include <iprt/list.h>
-#include <iprt/cpp/list.h> /* For RTCList. */
+#include <iprt/semaphore.h>
 
 #include <VBox/hgcmsvc.h>
@@ -34 +35 @@
 #include <VBox/HostServices/Service.h>
 #include <VBox/GuestHost/SharedClipboard.h>
-#ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
-# include <iprt/semaphore.h>
-# include <VBox/GuestHost/SharedClipboard-uri.h>
-#endif
+#include <VBox/GuestHost/SharedClipboard-uri.h>
 
 using namespace HGCM;

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp

@@ -1865 +1865 @@
 }
 
+#ifndef UNIT_TEST
 static int svcLoadStateV0(uint32_t u32ClientID, void *pvClient, PSSMHANDLE pSSM, uint32_t uVersion)
 {
@@ -1897 +1898 @@
     return VINF_SUCCESS;
 }
+#endif /* UNIT_TEST */
 
 static DECLCALLBACK(int) svcLoadState(void *, uint32_t u32ClientID, void *pvClient, PSSMHANDLE pSSM, uint32_t uVersion)