From: VMware, Inc <>
Date: Thu, 17 Jun 2010 21:13:38 +0000 (-0700)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2010.06.16-268169~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57d4ee97aa6450883c54ccb582a3256ad56647ef;p=thirdparty%2Fopen-vm-tools.git

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/msg.h b/open-vm-tools/lib/include/msg.h
index 0de7e1a14..d4ed0e635 100644
--- a/open-vm-tools/lib/include/msg.h
+++ b/open-vm-tools/lib/include/msg.h
@@ -169,6 +169,8 @@ EXTERN char *Msg_GetStringSafe(const char *idString);
 EXTERN char *Msg_GetPlainButtonText(const char *idString);
 EXTERN const char *Msg_GetLocale(void);
 EXTERN void Msg_SetLocale(const char *locale, const char *binaryName);
+EXTERN void Msg_SetLocaleEx(const char *locale, const char *binaryName,
+                            const char *baseDirPath);
 EXTERN char *Msg_GetMessageFilePath(const char *locale, const char *binaryName,
 				    const char *extension);
 EXTERN char *Msg_FormatFloat(double value, unsigned int precision);
diff --git a/open-vm-tools/lib/include/vix.h b/open-vm-tools/lib/include/vix.h
index 46b6f7a47..d1e4d68ad 100644
--- a/open-vm-tools/lib/include/vix.h
+++ b/open-vm-tools/lib/include/vix.h
@@ -184,6 +184,7 @@ enum {
    VIX_E_READ_ONLY_PROPERTY                     = 6002,
    VIX_E_MISSING_REQUIRED_PROPERTY              = 6003,
    VIX_E_INVALID_SERIALIZED_DATA                = 6004,
+   VIX_E_PROPERTY_TYPE_MISMATCH                 = 6005,
 
    /* Completion Errors */
    VIX_E_BAD_VM_INDEX                           = 8000,