From: Oliver Kurth <okurth@vmware.com>
Date: Mon, 6 Jan 2020 23:46:19 +0000 (-0800)
Subject: Remove overly complex ifdefs in the dndcp plugin.
X-Git-Tag: stable-11.1.0~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7971d265c234df0ef5af03155c6d90c52fb6398;p=thirdparty%2Fopen-vm-tools.git

Remove overly complex ifdefs in the dndcp plugin.
---

diff --git a/open-vm-tools/services/plugins/dndcp/dndGuest/copyPasteRpcV4.cc b/open-vm-tools/services/plugins/dndcp/dndGuest/copyPasteRpcV4.cc
index 1c4137757..e37e27995 100644
--- a/open-vm-tools/services/plugins/dndcp/dndGuest/copyPasteRpcV4.cc
+++ b/open-vm-tools/services/plugins/dndcp/dndGuest/copyPasteRpcV4.cc
@@ -28,13 +28,7 @@ extern "C" {
 #if defined VMX86_TOOLS
    #include "debug.h"
 
-/* gcc needs special syntax to handle zero-length variadic arguments */
-#if defined(_MSC_VER)
-   #define LOG(level, fmt, ...) Debug(fmt, __VA_ARGS__)
-#else
-   #define LOG(level, fmt, ...) Debug(fmt, ##__VA_ARGS__)
-#endif
-
+   #define LOG(level, ...) Debug(__VA_ARGS__)
 #else
    #define LOGLEVEL_MODULE dnd
    #define LOGLEVEL_VARIADIC
diff --git a/open-vm-tools/services/plugins/dndcp/dndGuest/dndRpcV4.cc b/open-vm-tools/services/plugins/dndcp/dndGuest/dndRpcV4.cc
index 7b371d573..9b6551bc8 100644
--- a/open-vm-tools/services/plugins/dndcp/dndGuest/dndRpcV4.cc
+++ b/open-vm-tools/services/plugins/dndcp/dndGuest/dndRpcV4.cc
@@ -28,13 +28,7 @@ extern "C" {
 #if defined VMX86_TOOLS
    #include "debug.h"
 
-/* gcc needs special syntax to handle zero-length variadic arguments */
-#if defined(_MSC_VER)
-   #define LOG(level, fmt, ...) Debug(fmt, __VA_ARGS__)
-#else
-   #define LOG(level, fmt, ...) Debug(fmt, ##__VA_ARGS__)
-#endif
-
+   #define LOG(level, ...) Debug(__VA_ARGS__)
 #else
    #define LOGLEVEL_MODULE dnd
    #define LOGLEVEL_VARIADIC
diff --git a/open-vm-tools/services/plugins/dndcp/dndGuest/fileTransferRpcV4.cc b/open-vm-tools/services/plugins/dndcp/dndGuest/fileTransferRpcV4.cc
index 6c2bca9eb..5c90f8352 100644
--- a/open-vm-tools/services/plugins/dndcp/dndGuest/fileTransferRpcV4.cc
+++ b/open-vm-tools/services/plugins/dndcp/dndGuest/fileTransferRpcV4.cc
@@ -36,13 +36,7 @@ extern "C" {
 #if defined VMX86_TOOLS
    #include "debug.h"
 
-/* gcc needs special syntax to handle zero-length variadic arguments */
-#if defined(_MSC_VER)
-   #define LOG(level, fmt, ...) Debug(fmt, __VA_ARGS__)
-#else
-   #define LOG(level, fmt, ...) Debug(fmt, ##__VA_ARGS__)
-#endif
-
+   #define LOG(level, ...) Debug(__VA_ARGS__)
 #else
    #define LOGLEVEL_MODULE dnd
    #define LOGLEVEL_VARIADIC
diff --git a/open-vm-tools/services/plugins/dndcp/dndGuest/rpcV3Util.cpp b/open-vm-tools/services/plugins/dndcp/dndGuest/rpcV3Util.cpp
index cb5b63288..0caebf263 100644
--- a/open-vm-tools/services/plugins/dndcp/dndGuest/rpcV3Util.cpp
+++ b/open-vm-tools/services/plugins/dndcp/dndGuest/rpcV3Util.cpp
@@ -33,12 +33,7 @@
 #ifdef VMX86_TOOLS
 extern "C" {      
    #include "debug.h"
-   /* gcc needs special syntax to handle zero-length variadic arguments */
-   #if defined(_MSC_VER)
-   #define LOG(level, fmt, ...) Debug(fmt, __VA_ARGS__)
-   #else
-   #define LOG(level, fmt, ...) Debug(fmt, ##__VA_ARGS__)
-   #endif
+   #define LOG(level, ...) Debug(__VA_ARGS__)
 }
 #else
    #define LOGLEVEL_MODULE dnd
diff --git a/open-vm-tools/services/plugins/dndcp/dndGuest/rpcV4Util.cpp b/open-vm-tools/services/plugins/dndcp/dndGuest/rpcV4Util.cpp
index dbc0897f3..c656a73e5 100644
--- a/open-vm-tools/services/plugins/dndcp/dndGuest/rpcV4Util.cpp
+++ b/open-vm-tools/services/plugins/dndcp/dndGuest/rpcV4Util.cpp
@@ -34,12 +34,7 @@
 #ifdef VMX86_TOOLS
 extern "C" {
    #include "debug.h"
-   /* gcc needs special syntax to handle zero-length variadic arguments */
-   #if defined(_MSC_VER)
-   #define LOG(level, fmt, ...) Debug(fmt, __VA_ARGS__)
-   #else
-   #define LOG(level, fmt, ...) Debug(fmt, ##__VA_ARGS__)
-   #endif
+   #define LOG(level, ...) Debug(__VA_ARGS__)
 }
 #else
    #define LOGLEVEL_MODULE dnd