Change 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 12d3dd5faa94729db0f87500d91fcb577e9ae57c..30ea3307aa637782402ff0c8d5fd4c993b409c29 100644 (file)
--- a/open-vm-tools/lib/include/vm_product.h
+++ b/open-vm-tools/lib/include/vm_product.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (c) 2006-2024 Broadcom. All Rights Reserved.
+ * Copyright (c) 2006-2025 Broadcom. All Rights Reserved.
  * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -140,25 +140,12 @@
 #define PRODUCT_VDDK_SHORT_NAME "VDDK"
 #define PRODUCT_VDDK_NAME MAKE_NAME("Virtual Disk Development Kit")
 
-#define PRODUCT_VDM_CLIENT_NAME MAKE_NAME("Horizon Client")
-#define PRODUCT_VDM_CLIENT_NAME_FOR_LICENSE PRODUCT_VDM_CLIENT_NAME
-
 #define PRODUCT_XVP_SHORT_NAME "XVP"
 #define PRODUCT_XVP_NAME MAKE_NAME("vCenter XVP Manager")
 #define PRODUCT_RMKSCONTAINER_NAME MAKE_NAME("Remote MKS Container")
 
 #define PRODUCT_HBR_SERVER_NAME MAKE_NAME("vSphere Replication Server")
 
-#define PRODUCT_VIEW_SHORT_NAME "Horizon View"
-#define PRODUCT_VIEW_NAME MAKE_NAME("Horizon View")
-#define PRODUCT_VIEW_NAME_FOR_LICENSE PRODUCT_VIEW_NAME
-
-#define PRODUCT_FLEX_GENERIC_SHORT_NAME "Horizon FLEX"
-#define PRODUCT_FLEX_GENERIC_NAME MAKE_NAME(PRODUCT_FLEX_GENERIC_SHORT_NAME)
-
-#define PRODUCT_FLEX_SERVER_SHORT_NAME PRODUCT_FLEX_GENERIC_SHORT_NAME " Server"
-#define PRODUCT_FLEX_SERVER_NAME MAKE_NAME(PRODUCT_FLEX_SERVER_SHORT_NAME)
-
 #define PRODUCT_VMCF_NAME MAKE_NAME("VMCF")
 
 #if defined(__linux__) || defined(__FreeBSD__)
@@ -405,8 +392,6 @@
  */
 #   if defined(VMX86_VMRC) /* check VMX86_VMRC before VMX86_DESKTOP */
 #      define PRODUCT_NAME_FOR_LICENSE PRODUCT_VMRC_NAME
-#   elif defined(VMX86_FLEX) /* check VMX86_FLEX before VMX86_DESKTOP */
-#      define PRODUCT_NAME_FOR_LICENSE PRODUCT_FLEX_NAME
 #   elif defined(VMX86_VPX)
 #      define PRODUCT_NAME_FOR_LICENSE PRODUCT_NAME " Server"
 // VMX86_DESKTOP must be last because it is the default and is always defined.

diff --git a/open-vm-tools/lib/include/vm_product_versions.h b/open-vm-tools/lib/include/vm_product_versions.h
index 3edd14f1fec482e3fdf42f5429a60bc4d0b91dc8..d7ea24e5b1a07355cc9afabc8147def04846be5e 100644 (file)
--- a/open-vm-tools/lib/include/vm_product_versions.h
+++ b/open-vm-tools/lib/include/vm_product_versions.h
@@ -72,10 +72,8 @@
  */
 
 //MARKER_FAST_REMOVE_START
-#if  defined (VMX86_VMRC) /* check VMX86_VMRC before VMX86_DESKTOP */
+#if defined(VMX86_VMRC) /* check VMX86_VMRC before VMX86_DESKTOP */
    #define PRODUCT_VERSION    13,0,0,0
-#elif defined(VMX86_FLEX) /* check VMX86_FLEX before VMX86_DESKTOP */
-   #define PRODUCT_VERSION    8,0,0,PRODUCT_BUILD_NUMBER_NUMERIC   /* FLEX_VERSION_NUMBER below has to match this */
 #elif defined(VMX86_TOOLS)
    #define PRODUCT_VERSION    TOOLS_VERSION_EXT_CURRENT_CSV
 #elif defined(VMX86_VLICENSE)
@@ -219,14 +217,11 @@
  * necessary VIX changes also need to be done. See bug 939456.
  *
  * ALSO, leave FOO_VERSION at e.x.p on all EXCEPT release branches.
- * lmclient.h has a FLEX_VERSION struct so the versionPrefix can't be FLEX
  */
 #define WORKSTATION_VERSION_NUMBER "17.0.0" /* this version number should always match real WS version number */
 #define WORKSTATION_VERSION "e.x.p"
 #define PLAYER_VERSION_NUMBER "17.0.0" /* this version number should always match real Player version number */
 #define PLAYER_VERSION "e.x.p"
-#define FLEX_CLIENT_VERSION_NUMBER "8.0.0"
-#define FLEX_CLIENT_VERSION "e.x.p"
 
 #define THINPRINT_VERSION "1.1.2"
 
@@ -402,8 +397,6 @@
 
 #if defined(VMX86_VMRC) /* check VMX86_VMRC before VMX86_DESKTOP */
 #  define PRODUCT_VERSION_NUMBER VMRC_VERSION
-#elif defined(VMX86_FLEX) /* check VMX86_FLEX before VMX86_DESKTOP */
-#  define PRODUCT_VERSION_NUMBER FLEX_VERSION
 #elif defined(VMX86_SERVER)
 #  define PRODUCT_VERSION_NUMBER ESX_VERSION
 #elif defined(VMX86_VPX)
@@ -483,7 +476,6 @@
 #define PRODUCT_MAC_DESKTOP_VERSION_STRING_FOR_LICENSE "13.0"
 #define PRODUCT_PLAYER_VERSION_STRING_FOR_LICENSE "17.0"
 #define PRODUCT_VMRC_VERSION_STRING_FOR_LICENSE "13.0"
-#define PRODUCT_FLEX_VERSION_STRING_FOR_LICENSE "8.0"
 
 #if defined(VMX86_TOOLS)
 /* This product doesn't use a license */
@@ -494,8 +486,6 @@
 #    define PRODUCT_LICENSE_VERSION "9.0"
 #  elif defined(VMX86_VMRC) /* check VMX86_VMRC before VMX86_DESKTOP */
 #    define PRODUCT_LICENSE_VERSION PRODUCT_VMRC_VERSION_STRING_FOR_LICENSE
-#  elif defined(VMX86_FLEX) /* check VMX86_FLEX before VMX86_DESKTOP */
-#    define PRODUCT_LICENSE_VERSION PRODUCT_FLEX_VERSION_STRING_FOR_LICENSE
 #  elif defined(VMX86_VPX)
 #    define PRODUCT_LICENSE_VERSION "9.0"
 #    define PRODUCT_LICENSE_FILE_VERSION "9.0.1.0"