Changeset 19644 in vbox for trunk/src

Timestamp:

May 12, 2009 3:29:22 PM (16 years ago)

Author:

vboxsync

Message:

VBoxService/common: Proper building with VBOX_WITH_GUEST_PROPS.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxServiceInternal.h (modified) (2 diffs)
• VBoxServiceUtils.cpp (modified) (2 diffs)
• VBoxServiceUtils.h (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk

@@ -40 +40 @@
         VBoxService.cpp \
         VBoxServiceTimeSync.cpp \
-        VBoxServiceVMInfo.cpp \
         VBoxServiceUtils.cpp
-VBoxService_SOURCES.win   = \
+ifdef VBOX_WITH_GUEST_PROPS
+ VBoxService_SOURCES.win  = \
+        VBoxServiceVMInfo-win.cpp
+ VBoxService_SOURCES     += \
+        VBoxServiceVMInfo.cpp
+endif
+VBoxService_SOURCES.win  += \
         VBoxService-win.rc \
-        VBoxService-win.cpp \
-        VBoxServiceVMInfo-win.cpp
+        VBoxService-win.cpp
 VBoxService_SOURCES.os2   = \
         VBoxService-os2.def \

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

@@ -144 +144 @@
 /** Uninstalls the service from the registry. */
 extern int VBoxServiceWinUninstall(void);
+#ifdef VBOX_WITH_GUEST_PROPS
 /** Detects wheter a user is logged on based on the enumerated processes. */
 extern BOOL VboxServiceVMInfoWinIsLoggedIn(VBOXSERVICEVMINFOUSER* a_pUserInfo,
@@ -151 +152 @@
 /** Gets logon user IDs from enumerated processes. */
 extern DWORD VboxServiceVMInfoWinGetLUIDsFromProcesses(PLUID *ppLuid);
-#endif
+#endif /* VBOX_WITH_GUEST_PROPS */
+#endif /* RT_OS_WINDOWS */
 
 __END_DECLS

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp

@@ -37 +37 @@
 
 
+#ifdef VBOX_WITH_GUEST_PROPS
 int VboxServiceWriteProp(uint32_t uiClientID, const char *pszKey, const char *pszValue)
 {
@@ -86 +87 @@
     return VboxServiceWriteProp(uiClientID, pszKey, szBuffer);
 }
+#endif /* VBOX_WITH_GUEST_PROPS */
 
 

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.h

@@ -25 +25 @@
 #include "VBoxServiceInternal.h"
 
+#ifdef VBOX_WITH_GUEST_PROPS
 int VboxServiceWritePropInt(uint32_t uiClientID, const char *pszKey, int iValue);
 int VboxServiceWriteProp(uint32_t uiClientID, const char *pszKey, const char *pszValue);
+#endif
 #ifdef RT_OS_WINDOWS
 /** Gets a pre-formatted version string from the VS_FIXEDFILEINFO table. */