Changes in shared code that don't affect open-vm-tools functionality.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/lib/include/ghIntegration.h b/open-vm-tools/lib/include/ghIntegration.h
index cc80622cfe1a43a301bb3dc83a91bef994e781e8..357d7660dd723ed2460c5cb61ef5a6e582f0eff8 100644 (file)
--- a/open-vm-tools/lib/include/ghIntegration.h
+++ b/open-vm-tools/lib/include/ghIntegration.h
@@ -25,11 +25,8 @@
 #ifndef _GH_INTEGRATION_H_
 #define _GH_INTEGRATION_H_
 
-#include "dbllnklst.h"
-#include "rpcin.h"
-
-
-extern DblLnkLst_Links launchMenu;
+// Forward declaration.
+struct RpcIn;
 
 /*
  * If other libraries want to use dynamic adding/removing of event monitoring
@@ -44,17 +41,18 @@ typedef HANDLE VMU_EVENT;
 typedef int VMU_EVENT;
 #endif
 
-
 typedef enum VmuCallbackAction {
    VMU_CALLBACK_ACTION_SUCCESS,
    VMU_CALLBACK_ACTION_ABORT
 } VmuCallbackAction;
+
 typedef VmuCallbackAction VMU_EventHandler(void *ctx, VMU_EVENT event);
 
 typedef enum VmuControllerAction {
    VMU_CONTROLLER_CB_ADD_EVENT = 1,
    VMU_CONTROLLER_CB_REMOVE_EVENT
 } VmuControllerAction;
+
 typedef Bool (VMU_ControllerCB)(void *ctx,
                                 VMU_EVENT event,
                                 VMU_EventHandler *eventHandler,
@@ -69,5 +67,4 @@ void GHI_RegisterCaps(void);
 void GHI_UnregisterCaps(void);
 void GHI_Gather(void);
 
-#endif
-
+#endif // _GH_INTEGRATION_H_

diff --git a/open-vm-tools/vmware-user/stringxx/string.hh b/open-vm-tools/vmware-user/stringxx/string.hh
index 98f6092556615ac1642e83ba3867743dd6ed4609..ec6c92eb2c138cee6fdeb846d94b020e5c275228 100644 (file)
--- a/open-vm-tools/vmware-user/stringxx/string.hh
+++ b/open-vm-tools/vmware-user/stringxx/string.hh
@@ -236,6 +236,11 @@ operator+(ConstUnicode lhs, const string &rhs) {
    return string(lhs) + rhs;
 }
 
+string inline
+operator+(const string& lhs, ConstUnicode rhs) {
+   return lhs + string(rhs);
+}
+
 bool inline
 operator==(ConstUnicode lhs, const string &rhs) {
    return string(lhs) == rhs;