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/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index 3cfd6bf3844afa0106f64853a468ec8b001eb317..25f2b8e7ef76b3ffb59f34a3bceee2191e18a670 100644 (file)
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -73,6 +73,7 @@
    GOT(GUEST_OS_SOLARIS9)                                     \
    GOT(GUEST_OS_SOLARIS10)                                    \
    GOT(GUEST_OS_SOLARIS10_64)                                 \
+   GOT(GUEST_OS_SOLARIS11_64)                                 \
    GOT(GUEST_OS_DARWIN9)           /* Mac OS 10.5 */          \
    GOT(GUEST_OS_DARWIN9_64)                                   \
    GOT(GUEST_OS_DARWIN10)          /* Mac OS 10.6 */          \

diff --git a/open-vm-tools/lib/include/vm_product.h b/open-vm-tools/lib/include/vm_product.h
index 95f2dd992cb8e8f8da0f27db58d2fd0ad77eca25..3cb951969053833fb8699f79bea8cb22861f09ea 100644 (file)
--- a/open-vm-tools/lib/include/vm_product.h
+++ b/open-vm-tools/lib/include/vm_product.h
@@ -450,12 +450,11 @@
 #   if defined(__APPLE__)
 #      if defined VMX86_DESKTOP
 /*
- * We will remove this definition soon. Fusion's library directory should not
- * be hardcoded: it prevents Fusion from being relocated. Use
- * Location_GetLibrary() instead.
+ * Fusion can be relocated, so it does not have a default library directory.
+ * To retrieve the Fusion library directory, use Location_GetLibrary() instead.
  */
 #         define DEFAULT_LIBDIRECTORY \
-             "/Applications/" PRODUCT_SHORT_NAME ".app/Contents/Library"
+             "/dev/null/Non-existing DEFAULT_LIBDIRECTORY"
 #      else
 #         define DEFAULT_LIBDIRECTORY VMWARE_HOST_DIRECTORY
 #      endif