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 1c413775707063e91bed701796306eb7418a6bb9..e37e2799581e80c42c17ac5845f3f3aa576c2ca5 100644 (file)
--- 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 7b371d573a2b3fa85ceb0f370e74e14084ada0b5..9b6551bc8db2726d3eb95dfb699ff8bc78a52a02 100644 (file)
--- 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 6c2bca9ebe343a8a7e3f8b22893d96df1558464f..5c90f8352277e6eb5634c57d0460106b7f55df0a 100644 (file)
--- 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 cb5b632884bc4d1e444d47e559cee8b1cfbbe604..0caebf2638975db68f60f507c4971f5b93958f36 100644 (file)
--- 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 dbc0897f36b0bb550ae36742efd71d8a8dc1f3a4..c656a73e5cc81272587b9f05fb1ceb8d93380a75 100644 (file)
--- 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