From: VMware, Inc <>
Date: Wed, 18 Sep 2013 03:41:16 +0000 (-0700)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2013.09.16-1328054~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf72ff33d02e9c1b0d6d2d3ab0a9b13c7a2747a9;p=thirdparty%2Fopen-vm-tools.git

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

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
---

diff --git a/open-vm-tools/lib/include/mutexRankLib.h b/open-vm-tools/lib/include/mutexRankLib.h
index 29fbd38ec..dd31dea9f 100644
--- a/open-vm-tools/lib/include/mutexRankLib.h
+++ b/open-vm-tools/lib/include/mutexRankLib.h
@@ -69,11 +69,6 @@
 #define RANK_hgfsSearchArrayLock     (RANK_libLockBase + 0x4060)
 #define RANK_hgfsNodeArrayLock       (RANK_libLockBase + 0x4070)
 
-/*
- * SLPv2 global lock
- */
-#define RANK_slpv2GlobalLock         (RANK_libLockBase + 0x4305)
-
 /*
  * vigor (must be < VMDB range and < disklib, see bug 741290)
  */
diff --git a/open-vm-tools/lib/include/vixCommands.h b/open-vm-tools/lib/include/vixCommands.h
index 3192a945c..0fd8ccd98 100644
--- a/open-vm-tools/lib/include/vixCommands.h
+++ b/open-vm-tools/lib/include/vixCommands.h
@@ -2129,14 +2129,6 @@ struct VixCommandGenericRequest {
 #include "vmware_pack_end.h"
 VixCommandGenericRequest;
 
-
-/*
- * These are values we use to discover hosts and guests through SLPv2.
- */
-#define VIX_SLPV2_SERVICE_NAME_TOOLS_SERVICE       "VMware_Vix_Tools"
-#define VIX_SLPV2_PROPERTY_IP_ADDR                 "IP"
-#define VIX_SLPV2_PROPERTY_MAC_ADDR                "Mac"
-
 /*
  * The security classifications for async op types/op code. Each op code
  * is given a security category, and the VMX uses that category to determine
diff --git a/open-vm-tools/lib/include/vm_product.h b/open-vm-tools/lib/include/vm_product.h
index 3cb951969..d7243645a 100644
--- a/open-vm-tools/lib/include/vm_product.h
+++ b/open-vm-tools/lib/include/vm_product.h
@@ -451,7 +451,7 @@
 #      if defined VMX86_DESKTOP
 /*
  * Fusion can be relocated, so it does not have a default library directory.
- * To retrieve the Fusion library directory, use Location_GetLibrary() instead.
+ * To retrieve the Fusion library directory, use Location_Get("libDir") instead.
  */
 #         define DEFAULT_LIBDIRECTORY \
              "/dev/null/Non-existing DEFAULT_LIBDIRECTORY"
diff --git a/open-vm-tools/lib/misc/codeset.c b/open-vm-tools/lib/misc/codeset.c
index 7f1f6fbf8..261709992 100644
--- a/open-vm-tools/lib/misc/codeset.c
+++ b/open-vm-tools/lib/misc/codeset.c
@@ -604,11 +604,10 @@ CodeSet_Init(const char *icuDataDir) // IN: ICU data file location in Current co
    } else {
       /* Use a default ICU data dir. */
 #   if defined __APPLE__
-      Location_GetLibrary_Type *Location_GetLibrary =
-         Location_GetLibrary_Addr();
+      Location_Get_Type *Location_Get = Location_Get_Addr();
 
-      if (Location_GetLibrary) {
-         char *libDir = Location_GetLibrary();
+      if (Location_Get) {
+         char *libDir = Location_Get("libDir");
          Bool success =    libDir
                         && DynBuf_Append(&dbpath, libDir, strlen(libDir));