Revert the previous commit.

diff --git a/open-vm-tools/lib/include/str.h b/open-vm-tools/lib/include/str.h
index a1d87820c0cab732c15283d21f934dc3e734cd7d..2234a26110fd9fe9c9d89e0e6a3ab85b5236d389 100644 (file)
--- a/open-vm-tools/lib/include/str.h
+++ b/open-vm-tools/lib/include/str.h
@@ -65,7 +65,7 @@ extern "C" {
  * These platforms use bsd_vsnprintf().
  * This does not mean it has bsd_vsnwprintf().
  */
-#if !defined(VMX86_TOOLS) || defined(_WIN32)
+#if !defined(OPEN_VM_TOOLS)
 #if (defined _WIN32 && !defined STR_NO_WIN32_LIBS) || \
     (defined __linux__ && !defined __UCLIBC__) || \
     defined __APPLE__
@@ -76,7 +76,7 @@ extern "C" {
 /*
  * And these platforms/setups use bsd_vsnwprintf()
  */
-#if !defined(VMX86_TOOLS) || defined(_WIN32)
+#if !defined(OPEN_VM_TOOLS)
 #if (defined _WIN32 && !defined STR_NO_WIN32_LIBS) || \
    (defined __GNUC__ && (__GNUC__ < 2                 \
                          || (__GNUC__ == 2            \