From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 27 Jul 2018 18:46:21 +0000 (-0700)
Subject: Changes to common header files; not applicable to open-vm-tools.
X-Git-Tag: stable-11.0.0~506
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a79c38c8f266712bae44053c5fb41d237a4bee0f;p=thirdparty%2Fopen-vm-tools.git

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

diff --git a/open-vm-tools/lib/include/vm_product.h b/open-vm-tools/lib/include/vm_product.h
index 2bfff2a8d..1f4c559cc 100644
--- a/open-vm-tools/lib/include/vm_product.h
+++ b/open-vm-tools/lib/include/vm_product.h
@@ -93,9 +93,6 @@
 #define PRODUCT_GANTRY_NAME MAKE_NAME(PRODUCT_GANTRY_BRIEF_NAME)
 #define PRODUCT_GANTRY_NAME_FOR_LICENSE PRODUCT_GANTRY_NAME
 
-#define PRODUCT_VMLS_SHORT_NAME "VMLS"
-#define PRODUCT_VMLS_NAME MAKE_NAME("License Server")
-
 #define PRODUCT_VLICENSE_SHORT_NAME "VLICENSE"
 #define PRODUCT_VLICENSE_NAME MAKE_NAME("License Infrastructure")
 
@@ -195,7 +192,6 @@
       || defined(VMX86_TOOLS)    \
       || defined(VMX86_V2V)      \
       || defined(VMX86_SYSIMAGE) \
-      || defined(VMX86_VMLS)     \
       || defined(VMX86_VLICENSE) \
       || defined(VMX86_P2V)      \
       || defined(VMX86_DDK)      \
@@ -253,8 +249,6 @@
 # define PRODUCT_SHORT_NAME PRODUCT_V2V_NAME
 #elif defined(VMX86_SYSIMAGE)
 # define PRODUCT_SHORT_NAME PRODUCT_SYSIMAGE_NAME
-#elif defined(VMX86_VMLS)
-# define PRODUCT_SHORT_NAME PRODUCT_VMLS_NAME
 #elif defined(VMX86_VLICENSE)
 # define PRODUCT_SHORT_NAME PRODUCT_VLICENSE_NAME
 #elif defined(VMX86_DDK)
diff --git a/open-vm-tools/lib/include/vm_product_versions.h b/open-vm-tools/lib/include/vm_product_versions.h
index ee00110c7..158d67334 100644
--- a/open-vm-tools/lib/include/vm_product_versions.h
+++ b/open-vm-tools/lib/include/vm_product_versions.h
@@ -249,7 +249,6 @@
 #define SDK_VERSION "4.1.0"
 #define FOUNDRY_VERSION "1.17.0"
 #define FOUNDRY_FILE_VERSION 1,17,0,PRODUCT_BUILD_NUMBER_NUMERIC
-#define VMLS_VERSION "e.x.p"
 #define VLICENSE_VERSION "1.1.5"
 #define DDK_VERSION "e.x.p"
 #define VIPERL_VERSION "6.7.0"
@@ -346,8 +345,6 @@
 #  define PRODUCT_VERSION_NUMBER VCB_VERSION
 #elif defined(VMX86_FOUNDRY)
 #  define PRODUCT_VERSION_NUMBER FOUNDRY_VERSION
-#elif defined(VMX86_VMLS)
-#  define PRODUCT_VERSION_NUMBER VMLS_VERSION
 #elif defined(VMX86_VLICENSE)
 #  define PRODUCT_VERSION_NUMBER VLICENSE_VERSION
 #elif defined(VMX86_DDK)