Resolve merge conflicts.

diff --git a/open-vm-tools/lib/include/vm_tools_version.h b/open-vm-tools/lib/include/vm_tools_version.h
index 5a745c7b588da8edbd0a1176961e4efe9f0d382d..ef67f737c812254f60e41e89b53e334093bffd36 100644 (file)
--- a/open-vm-tools/lib/include/vm_tools_version.h
+++ b/open-vm-tools/lib/include/vm_tools_version.h
@@ -1810,24 +1810,9 @@ TOOLS_VERSION_UINT_TO_COMPONENTS(const ToolsVersion toolsVersion,   // IN
 #define   TOOLS_VERSION_NEXT_V_MNR  0
 #define   TOOLS_VERSION_NEXT_V_BASE 0
 
-#ifndef RC_INVOKED
-#define   TOOLS_VERSION_PLIERS_PATCH1 TOOLS_VERSION_TO_UINT(TOOLS_VERSION_PLIERS_PATCH1_V)
-#endif /* RC_INVOKED */
-#define   TOOLS_VERSION_PLIERS_PATCH1_V_MJR  12
-#define   TOOLS_VERSION_PLIERS_PATCH1_V_MNR  5
-#define   TOOLS_VERSION_PLIERS_PATCH1_V_BASE 1
-
-
-#ifndef RC_INVOKED
-#define   TOOLS_VERSION_PLIERS_PATCH2 TOOLS_VERSION_TO_UINT(TOOLS_VERSION_PLIERS_PATCH2_V)
-#endif /* RC_INVOKED */
-#define   TOOLS_VERSION_PLIERS_PATCH2_V_MJR  12
-#define   TOOLS_VERSION_PLIERS_PATCH2_V_MNR  5
-#define   TOOLS_VERSION_PLIERS_PATCH2_V_BASE 2
-
-#define   TOOLS_VERSION_CURRENT        TOOLS_VERSION_PLIERS_PATCH2
-#define   TOOLS_VERSION_CURRENT_STR    TOOLS_VERSION_TO_STR(TOOLS_VERSION_PLIERS_PATCH2)
-#define   TOOLS_VERSION_CURRENT_CSV    TOOLS_VERSION_TO_CSV(TOOLS_VERSION_PLIERS_PATCH2)
+#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

diff --git a/open-vm-tools/services/vmtoolsd/l10n/es.vmsg b/open-vm-tools/services/vmtoolsd/l10n/es.vmsg
index 3b20cc09923babe3989a227510e2c083c5d82fc8..b13cf2b8b388610134e09a72706c713b33c3ddab 100644 (file)
--- a/open-vm-tools/services/vmtoolsd/l10n/es.vmsg
+++ b/open-vm-tools/services/vmtoolsd/l10n/es.vmsg
@@ -23,7 +23,7 @@ cmdline.background.pidfile = "archivo pid"
 
 cmdline.blockfd = "Descriptor del archivo para el sistema de archivos de bloqueo de VMware."
 
-cmdline.blockfd.fd = "fd"
+cmdline.blockfd.fd = "descriptor del archivo"
 
 cmdline.commonpath = "Ruta al directorio de complementos frecuentes."
 

diff --git a/open-vm-tools/vgauth/serviceImpl/saml-xmlsec1.c b/open-vm-tools/vgauth/serviceImpl/saml-xmlsec1.c
index c127cbcefbad7e695dc6d5eb06650925a9d40c68..7bf70fa74adb1e795995d482201fc12c35e786db 100644 (file)
--- a/open-vm-tools/vgauth/serviceImpl/saml-xmlsec1.c
+++ b/open-vm-tools/vgauth/serviceImpl/saml-xmlsec1.c
@@ -33,22 +33,6 @@
 #include <libxml/catalog.h>
 #include <libxml/xmlschemas.h>
 
-// PR 3416639, xmlFile* APIs were deprecated in libxml2 2.13.0
-// Ignore the deprecated warnings after updating libxml2 to 2.13.3
-// ToDo: Define the deprecated APIs locally and remove the
-// XML_IGNORE_DEPRECATION_WARNINGS
-#ifdef _WIN32
-#define XML_IGNORE_DEPRECATION_WARNINGS \
-    __pragma(warning(push)) \
-    __pragma(warning(disable : 4996))
-#define XML_POP_WARNINGS __pragma(warning(pop))
-#else
-#define XML_IGNORE_DEPRECATION_WARNINGS \
-    _Pragma("GCC diagnostic push") \
-    _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
-#define XML_POP_WARNINGS _Pragma("GCC diagnostic pop")
-#endif
-
 #include <xmlsec/xmlsec.h>
 #include <xmlsec/xmltree.h>
 #include <xmlsec/xmldsig.h>