From: VMware, Inc <> Date: Fri, 12 Apr 2013 19:42:48 +0000 (-0700) Subject: Changes in shared code that don't affect open-vm-tools functionality. X-Git-Tag: 2013.04.16-1098359~69 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bbac629bbdf66c652262c284952ad792c4b0b481;p=thirdparty%2Fopen-vm-tools.git Changes in shared code that don't affect open-vm-tools functionality. Signed-off-by: Dmitry Torokhov --- diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h index 3cfd6bf38..25f2b8e7e 100644 --- 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 95f2dd992..3cb951969 100644 --- 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