From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 2 Aug 2019 18:07:20 +0000 (-0700)
Subject: Convert linux to __linux__ in preprocessor statements.
X-Git-Tag: stable-11.1.0~289
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da44b2d50727aca00249dc58796e84be11a3ff15;p=thirdparty%2Fopen-vm-tools.git

Convert linux to __linux__ in preprocessor statements.

Linux ABI uses __linux__, not linux (deprecated).
---

diff --git a/open-vm-tools/tests/testVmblock/vmblocktest.c b/open-vm-tools/tests/testVmblock/vmblocktest.c
index c45f1b550..157a85074 100644
--- a/open-vm-tools/tests/testVmblock/vmblocktest.c
+++ b/open-vm-tools/tests/testVmblock/vmblocktest.c
@@ -76,7 +76,7 @@
 #define THREAD_LOG(fmt, args...)   lprintf(" (%lx) " fmt, (unsigned long)pthread_self(), ## args)
 #define THREAD_ERROR(fmt, args...) lfprintf(stderr, " (%"FMTPID") " fmt, getpid(), ## args)
 
-#if defined (linux) || defined(__FreeBSD__)
+#if defined (__linux__) || defined(__FreeBSD__)
 # define os_thread_yield()      sched_yield()
 #elif defined(sun)
 # define os_thread_yield()      yield()