From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:00 +0000 (-0700)
Subject: Common header file change; not directly applicable to open-vm-tools.
X-Git-Tag: stable-10.2.0~570
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03542fe6cfdb9a7a601792714b048b073356876d;p=thirdparty%2Fopen-vm-tools.git

Common header file change; not directly applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/misc/vthreadBase.c b/open-vm-tools/lib/misc/vthreadBase.c
index 610e05331..03b26a72f 100644
--- a/open-vm-tools/lib/misc/vthreadBase.c
+++ b/open-vm-tools/lib/misc/vthreadBase.c
@@ -69,7 +69,14 @@
  *      we use the safer Tls* functions.
  */
 
-#if defined __linux__
+#if defined __APPLE__
+#include <assert.h>
+#include <TargetConditionals.h>
+#else
+#define TARGET_OS_IPHONE 0
+#endif
+
+#if defined __linux__ && !defined __ANDROID__ && !TARGET_OS_IPHONE
 #  define HAVE_TLS
 #endif