Change to common header file not applicable to open-vm-tools.

diff --git a/open-vm-tools/lib/include/vm_tools_version.h b/open-vm-tools/lib/include/vm_tools_version.h
index ef67f737c812254f60e41e89b53e334093bffd36..c606b6c698ae724357a86b12b6e512edad3cc3de 100644 (file)
--- a/open-vm-tools/lib/include/vm_tools_version.h
+++ b/open-vm-tools/lib/include/vm_tools_version.h
@@ -1804,15 +1804,22 @@ TOOLS_VERSION_UINT_TO_COMPONENTS(const ToolsVersion toolsVersion,   // IN
 #define   TOOLS_VERSION_PLIERS_RELEASE_V_BASE 0
 
 #ifndef RC_INVOKED
-#define   TOOLS_VERSION_NEXT TOOLS_VERSION_TO_UINT(TOOLS_VERSION_NEXT_V)
+#define   TOOLS_VERSION_SWISS_ARMY_KNIFE_RELEASE TOOLS_VERSION_TO_UINT(TOOLS_VERSION_SWISS_ARMY_KNIFE_RELEASE_V)
 #endif /* RC_INVOKED */
-#define   TOOLS_VERSION_NEXT_V_MJR  13
-#define   TOOLS_VERSION_NEXT_V_MNR  0
-#define   TOOLS_VERSION_NEXT_V_BASE 0
+#define   TOOLS_VERSION_SWISS_ARMY_KNIFE_RELEASE_V_MJR  13
+#define   TOOLS_VERSION_SWISS_ARMY_KNIFE_RELEASE_V_MNR  0
+#define   TOOLS_VERSION_SWISS_ARMY_KNIFE_RELEASE_V_BASE 0
 
-#define   TOOLS_VERSION_CURRENT        TOOLS_VERSION_NEXT
-#define   TOOLS_VERSION_CURRENT_STR    TOOLS_VERSION_TO_STR(TOOLS_VERSION_NEXT)
-#define   TOOLS_VERSION_CURRENT_CSV    TOOLS_VERSION_TO_CSV(TOOLS_VERSION_NEXT)
+#ifndef RC_INVOKED
+#define   TOOLS_VERSION_SWISS_ARMY_KNIFE_UPDATE1 TOOLS_VERSION_TO_UINT(TOOLS_VERSION_SWISS_ARMY_KNIFE_UPDATE1_V)
+#endif /* RC_INVOKED */
+#define   TOOLS_VERSION_SWISS_ARMY_KNIFE_UPDATE1_V_MJR  13
+#define   TOOLS_VERSION_SWISS_ARMY_KNIFE_UPDATE1_V_MNR  0
+#define   TOOLS_VERSION_SWISS_ARMY_KNIFE_UPDATE1_V_BASE 1
+
+#define   TOOLS_VERSION_CURRENT        TOOLS_VERSION_SWISS_ARMY_KNIFE_UPDATE1
+#define   TOOLS_VERSION_CURRENT_STR    TOOLS_VERSION_TO_STR(TOOLS_VERSION_SWISS_ARMY_KNIFE_UPDATE1)
+#define   TOOLS_VERSION_CURRENT_CSV    TOOLS_VERSION_TO_CSV(TOOLS_VERSION_SWISS_ARMY_KNIFE_UPDATE1)
 
 /*
  * The extended Tools version is the current Tools version with the

diff --git a/open-vm-tools/libDeployPkg/linuxDeployment.c b/open-vm-tools/libDeployPkg/linuxDeployment.c
index 44cac8ef46e21d8c8864b081cbc8ebcf2bc92cef..9bfb6820d190e0899da33581261fef0a75cea2ad 100644 (file)
--- a/open-vm-tools/libDeployPkg/linuxDeployment.c
+++ b/open-vm-tools/libDeployPkg/linuxDeployment.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (c) 2006-2024 Broadcom. All rights reserved.
+ * Copyright (c) 2006-2024 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

diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c
index 46fb8374490865a1739990d6ab4e1f656ee31a70..8b946560579c74a8e34558b857657fc4fd8ea30d 100644 (file)
--- a/open-vm-tools/services/plugins/vix/vixTools.c
+++ b/open-vm-tools/services/plugins/vix/vixTools.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (c) 2007-2024 Broadcom. All rights reserved.
+ * Copyright (c) 2007-2024 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