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

diff --git a/open-vm-tools/lib/include/vm_basic_defs.h b/open-vm-tools/lib/include/vm_basic_defs.h
index 0f8c2c0a29590660414d51e99991d2000a0ad598..8f5d226fdd50bf548c4503bd0da88230e8f7f124 100644 (file)
--- a/open-vm-tools/lib/include/vm_basic_defs.h
+++ b/open-vm-tools/lib/include/vm_basic_defs.h
@@ -605,9 +605,21 @@ typedef int pid_t;
 
 #undef X86_ONLY
 #ifdef VM_X86_ANY
-#define X86_ONLY(...)    __VA_ARGS__
-#else
-#define X86_ONLY(...)
+# ifdef _MSC_VER
+/*
+ * Old MSVC versions (such as MSVC 14.29.30133, used to build Workstation's
+ * offset checker) are notorious to have non-standard __VA_ARGS__ handling.
+ */
+#  define X86_ONLY(x)      x
+# else
+#  define X86_ONLY(...)    __VA_ARGS__
+# endif
+#else
+# ifdef _MSC_VER
+#  define X86_ONLY(x)
+# else
+#  define X86_ONLY(...)
+# endif
 #endif
 
 #undef DEBUG_ONLY