Changes to common header files; not applicable to open-vm-tools.

diff --git a/open-vm-tools/lib/include/ghIntegrationCommon.h b/open-vm-tools/lib/include/ghIntegrationCommon.h
index d12d0951cdf0677789d4def9f58640f0087fc5ad..c20b2196cbb0d384e75a305869cca749a7dba7bc 100644 (file)
--- a/open-vm-tools/lib/include/ghIntegrationCommon.h
+++ b/open-vm-tools/lib/include/ghIntegrationCommon.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2008-2014 VMware, Inc. All rights reserved.
+ * Copyright (C) 2008-2018 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -31,4 +31,24 @@
 #define GHI_HGFS_SHARE_URL_UTF8 "x-vmware-share://"
 #define GHI_HGFS_SHARE_URL      _T(GHI_HGFS_SHARE_URL_UTF8)
 
+/*
+ * A GHI/Unity request from the host to the guest can be sent to different
+ * TCLO channels of guestRPC (refer to tclodefs.h). Mostly we use TOOLS_DND_NAME
+ * channel and only a few may use TOOLS_DAEMON_NAME.
+ */
+#define GHI_CHANNEL_USER_SERVICE  0  // TOOLS_DND_NAME TCLO channel
+#define GHI_CHANNEL_MAIN_SERVICE  1  // TOOLS_DAEMON_NAME TCLO channel
+#define GHI_CHANNEL_MAX           2
+typedef uint32 GHIChannelType;
+
+#define GHI_REQUEST_SUCCESS_OK       0  // Guest returns OK.
+#define GHI_REQUEST_SUCCESS_ERROR    1  // Guest returns ERROR.
+#define GHI_REQUEST_GUEST_RPC_FAILED 2  // Not sent to guest
+                                        // or guest failed to return,
+                                        // including timeout.
+#define GHI_REQUEST_GENERAL_ERROR    3  // General error, can be any
+                                        // situation except
+                                        // MKSCONTROL_GHI_REQUEST_SUCCESS_OK.
+typedef uint32 GHIRequestResult;
+
 #endif // ifndef _GHINTEGRATIONCOMMON_H_

diff --git a/open-vm-tools/lib/include/vm_product.h b/open-vm-tools/lib/include/vm_product.h
index c60d967ff05cb042028424a9e9b9cdd6672cf9f1..c1a3340f2ad53ff0756e9020f6e0ab5d291ca8b3 100644 (file)
--- a/open-vm-tools/lib/include/vm_product.h
+++ b/open-vm-tools/lib/include/vm_product.h
@@ -204,7 +204,7 @@
       || defined(VMX86_VMCF) \
       || defined(VMX86_GANTRY) \
       || defined(VMX86_VMRC))
-#   if defined(_WIN32) || defined(__APPLE__)
+#   if defined(_WIN32) || defined(__APPLE__) || defined(__linux__)
       /*
        * XXX Make the product be Workstation by default if none of the defines
        * XXX above are not defined in defs-globaldefs.mk -- Edward A. Waugh

diff --git a/open-vm-tools/lib/include/vm_product_versions.h b/open-vm-tools/lib/include/vm_product_versions.h
index 7bb7c8bb83f94a15e6b961836e57b2c0b569b027..3d1fe3a8bb1fc2a32210c3b62d6489051589c7bf 100644 (file)
--- a/open-vm-tools/lib/include/vm_product_versions.h
+++ b/open-vm-tools/lib/include/vm_product_versions.h
@@ -271,6 +271,7 @@
 #define VIEW_CLIENT_VERSION_NUMBER "4.5.1"
 #define VIEW_CLIENT_VERSION "4.7.0"
 #define VHSESDK_VERSION "1.0.0"
+#define VIEWVC_VERSION "14.0.0"
 
 /*
  * All of these components should follow the current version of View.