From: Oliver Kurth <okurth@vmware.com>
Date: Thu, 13 Feb 2020 00:49:09 +0000 (-0800)
Subject: Back out the previous change to lib/include/str.h
X-Git-Tag: stable-11.1.0~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb31c37217ed2cef757747ff82a7faa4d168cf20;p=thirdparty%2Fopen-vm-tools.git

Back out the previous change to lib/include/str.h
---

diff --git a/open-vm-tools/lib/include/str.h b/open-vm-tools/lib/include/str.h
index 61e13a314..22b9108d6 100644
--- a/open-vm-tools/lib/include/str.h
+++ b/open-vm-tools/lib/include/str.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2020 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2018 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -71,7 +71,7 @@ extern "C" {
  */
 #if !defined(VMX86_TOOLS) || defined(_WIN32)
 #if (defined _WIN32 && !defined STR_NO_WIN32_LIBS) || \
-    (defined __linux__ && !defined __UCLIBC__ && !defined __ANDROID__) || \
+    (defined __linux__ && !defined __UCLIBC__) || \
     defined __APPLE__
 #define HAS_BSD_PRINTF 1
 #endif