Get correct vm_tools_version.h for the merge from stable-12.5.x

diff --git a/open-vm-tools/lib/include/vm_tools_version.h b/open-vm-tools/lib/include/vm_tools_version.h
index 21a75792d2cbdb6583e83e3b7329f9825dfc92aa..ec7047fbb0b326cd98464f5d0cb37eae1af9e8ec 100644 (file)
--- a/open-vm-tools/lib/include/vm_tools_version.h
+++ b/open-vm-tools/lib/include/vm_tools_version.h
@@ -1793,16 +1793,9 @@ TOOLS_VERSION_UINT_TO_COMPONENTS(const ToolsVersion toolsVersion,   // IN
 #define   TOOLS_VERSION_NEXT_V_MNR  5
 #define   TOOLS_VERSION_NEXT_V_BASE 0
 
-#ifndef RC_INVOKED
-#define   TOOLS_VERSION_SOCKET_WRENCH_UPDATE1 TOOLS_VERSION_TO_UINT(TOOLS_VERSION_SOCKET_WRENCH_UPDATE1_V)
-#endif /* RC_INVOKED */
-#define   TOOLS_VERSION_SOCKET_WRENCH_UPDATE1_V_MJR  12
-#define   TOOLS_VERSION_SOCKET_WRENCH_UPDATE1_V_MNR  4
-#define   TOOLS_VERSION_SOCKET_WRENCH_UPDATE1_V_BASE 5
-
-#define   TOOLS_VERSION_CURRENT        TOOLS_VERSION_SOCKET_WRENCH_UPDATE1
-#define   TOOLS_VERSION_CURRENT_STR    TOOLS_VERSION_TO_STR(TOOLS_VERSION_SOCKET_WRENCH_UPDATE1)
-#define   TOOLS_VERSION_CURRENT_CSV    TOOLS_VERSION_TO_CSV(TOOLS_VERSION_SOCKET_WRENCH_UPDATE1)
+#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)
 
 /*
  * The extended Tools version is the current Tools version with the