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 2bfff2a8d200d6377386649f365d2244ede1c67d..1f4c559cc61e94e699a02328b770cb272f74ad8d 100644 (file)
--- 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 ee00110c7067011e29e6794d8467cef35d357286..158d67334dbccda3993672921579b343638b88f2 100644 (file)
--- 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)