Partial change linux -> __linux__, Tools edition

Linux ABI uses __linux__, not linux (deprecated).

diff --git a/open-vm-tools/lib/include/syncDriverIoc.h b/open-vm-tools/lib/include/syncDriverIoc.h
index 55dc07e10d51482a652d7df0271062d6024b833b..80273f817fdaf37fe0bc6fea0b5480b804152205 100644 (file)
--- a/open-vm-tools/lib/include/syncDriverIoc.h
+++ b/open-vm-tools/lib/include/syncDriverIoc.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2007-2016 VMware, Inc. All rights reserved.
+ * Copyright (C) 2007-2016,2019 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
@@ -30,7 +30,7 @@
 #ifndef _SYNCDRIVERIOC_H_
 #define _SYNCDRIVERIOC_H_
 
-#ifdef linux
+#ifdef __linux__
 
 # include <linux/ioctl.h>
 

diff --git a/open-vm-tools/lib/nicInfo/nicInfo.c b/open-vm-tools/lib/nicInfo/nicInfo.c
index ce9ebae38e8ac2fd14e26141eda64f6809cf842e..694a9a0566ac5b0559f3af30390e163262f47e85 100644 (file)
--- a/open-vm-tools/lib/nicInfo/nicInfo.c
+++ b/open-vm-tools/lib/nicInfo/nicInfo.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2014-2018 VMware, Inc. All rights reserved.
+ * Copyright (C) 2014-2019 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
@@ -582,7 +582,7 @@ GuestInfoDupTypedIpAddress(TypedIpAddress *srcIp,   // IN
 #endif // if defined _WIN32
 
 
-#if defined linux || defined _WIN32
+#if defined __linux__ || defined _WIN32
 /*
  ******************************************************************************
  * GuestInfoGetNicInfoIfIndex --                                         */ /**
@@ -636,7 +636,7 @@ GuestInfoGetNicInfoIfIndex(NicInfoV3 *nicInfo,
 
    return ret;
 }
-#endif // if defined linux || defined _WIN32
+#endif // if defined __linux__ || defined _WIN32
 
 
 /*

diff --git a/open-vm-tools/lib/nicInfo/nicInfoInt.h b/open-vm-tools/lib/nicInfo/nicInfoInt.h
index 1fac8024c2d70fecd4142780ebecbf59ca9f08b0..c929722e7425a965f623bea82d6cb29bb842e0ef 100644 (file)
--- a/open-vm-tools/lib/nicInfo/nicInfoInt.h
+++ b/open-vm-tools/lib/nicInfo/nicInfoInt.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2014-2018 VMware, Inc. All rights reserved.
+ * Copyright (C) 2014-2019 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
@@ -56,11 +56,11 @@ void GuestInfoDupTypedIpAddress(TypedIpAddress *srcIp,   // IN
                                 TypedIpAddress *destIp);  // OUT
 #endif // if defined _WIN32
 
-#if defined linux || defined _WIN32
+#if defined __linux__ || defined _WIN32
 Bool GuestInfoGetNicInfoIfIndex(NicInfoV3 *nicInfo,  // IN
                                 int ifIndex,         // IN
                                 int *nicIfIndex);    // OUT
-#endif // if defined linux || defined _WIN32
+#endif // if defined __linux__ || defined _WIN32
 void GuestInfoSockaddrToTypedIpAddress(const struct sockaddr *sa,    // IN
                                        TypedIpAddress *typedIp);     // OUT
 

diff --git a/open-vm-tools/libappmonitor/vmGuestAppMonitorLib.c b/open-vm-tools/libappmonitor/vmGuestAppMonitorLib.c
index 74a05069885ae91a0ab69e0b883a978442f95107..b8ce9f65e57f7acbf4c3187cf397abe0e77e8144 100644 (file)
--- a/open-vm-tools/libappmonitor/vmGuestAppMonitorLib.c
+++ b/open-vm-tools/libappmonitor/vmGuestAppMonitorLib.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2009-2018 VMware, Inc. All rights reserved.
+ * Copyright (C) 2009-2019 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
@@ -83,7 +83,7 @@ DestroySecRpcChannel();
 static void
 DestroyChannel();
 
-#if defined(VMX86_DEBUG) && defined(linux)
+#if defined(VMX86_DEBUG) && defined(__linux__)
 static void
 LogChannelType(const char *filePath, const char *chanType);
 #endif
@@ -278,7 +278,7 @@ CreateSecRpcChannel()
        * VMAppmon unit tests. Changing this log message/file path
        * will break the unit tests.
        */
-      #if defined(VMX86_DEBUG) && defined(linux)
+      #if defined(VMX86_DEBUG) && defined(__linux__)
       LogChannelType("/tmp/chanType.txt", (RpcChannel_GetType(gChan) == RPCCHANNEL_TYPE_BKDOOR ? "BACKDOOR" : "VSOCK"));
       #endif
       return start;
@@ -305,7 +305,7 @@ DestroySecRpcChannel()
    }
 }
 
-#if defined(VMX86_DEBUG) && defined(linux)
+#if defined(VMX86_DEBUG) && defined(__linux__)
 /*
  ******************************************************************************
  * LogChannelType --                                               */ /**

diff --git a/open-vm-tools/modules/shared/vmmemctl/kernelStubs.h b/open-vm-tools/modules/shared/vmmemctl/kernelStubs.h
index 5fff105f62aeb28e7f9f07e3a0b149508671af91..188c2576b5b5c315a04b77ea14e568cefda39735 100644 (file)
--- a/open-vm-tools/modules/shared/vmmemctl/kernelStubs.h
+++ b/open-vm-tools/modules/shared/vmmemctl/kernelStubs.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2006-2018 VMware, Inc. All rights reserved.
+ * Copyright (C) 2006-2019 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
@@ -81,7 +81,7 @@
 #  endif
 #endif
 
-#ifdef linux
+#ifdef __linux__
 #   ifndef __KERNEL__
 #      error "__KERNEL__ is not defined"
 #   endif
@@ -154,7 +154,7 @@
 
 #if defined(__linux__) || defined(__APPLE__) || defined (sun)
 
-#  ifdef linux                               /* if (linux) { */
+#  ifdef __linux__                           /* if (__linux__) { */
 char *strdup(const char *source);
 #  endif
 

diff --git a/open-vm-tools/modules/solaris/vmhgfs/kernelStubs.h b/open-vm-tools/modules/solaris/vmhgfs/kernelStubs.h
index 861e92b1642ed3e89baec0a32f8abe0f431a6609..deb56c6667fffb4d9f3b617f5c6a8cadb725ca39 100644 (file)
--- a/open-vm-tools/modules/solaris/vmhgfs/kernelStubs.h
+++ b/open-vm-tools/modules/solaris/vmhgfs/kernelStubs.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2006-2018 VMware, Inc. All rights reserved.
+ * Copyright (C) 2006-2019 VMware, Inc. All rights reserved.
  *
  * The contents of this file are subject to the terms of the Common
  * Development and Distribution License (the "License") version 1.0
@@ -40,7 +40,7 @@
 #  endif
 #endif
 
-#ifdef linux
+#ifdef __linux__
 #   ifndef __KERNEL__
 #      error "__KERNEL__ is not defined"
 #   endif
@@ -113,7 +113,7 @@
 
 #if defined(__linux__) || defined(__APPLE__) || defined (sun)
 
-#  ifdef linux                               /* if (linux) { */
+#  ifdef __linux__                           /* if (__linux__) { */
 char *strdup(const char *source);
 #  endif
 

diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c
index 44bca5cbd48cda72d4a788e03300e2c10792c677..780729c2bdc72df249b68fb4de3006ee7fea1e7b 100644 (file)
--- a/open-vm-tools/services/plugins/vix/vixTools.c
+++ b/open-vm-tools/services/plugins/vix/vixTools.c
@@ -124,7 +124,7 @@
 #endif /* _WIN32 */
 #include "hgfsHelper.h"
 
-#ifdef linux
+#ifdef __linux__
 #include "mntinfo.h"
 #include <sys/vfs.h>
 #endif
@@ -8869,7 +8869,7 @@ VixToolsListFileSystems(VixCommandRequestHeader *requestMsg, // IN
    char *fileSystemType;
    int i;
 #endif
-#ifdef linux
+#ifdef __linux__
    MNTHANDLE fp;
    DECLARE_MNTINFO(mnt);
    const char *mountfile = NULL;

diff --git a/open-vm-tools/vgauth/common/vmxlog.c b/open-vm-tools/vgauth/common/vmxlog.c
index 664b2853814d6f55c08b7b3544c6df362b528e7e..fd0f495ef45925887a050acb1fc6532efaa96229 100644 (file)
--- a/open-vm-tools/vgauth/common/vmxlog.c
+++ b/open-vm-tools/vgauth/common/vmxlog.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2018 VMware, Inc. All rights reserved.
+ * Copyright (C) 2018-2019 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
@@ -77,7 +77,7 @@ typedef unsigned __int32 uint32;
 typedef unsigned __int64 uint64;
 
 #endif
-#ifdef linux
+#ifdef __linux__
 typedef __uint32_t uint32;
 typedef __uint64_t uint64;
 

diff --git a/open-vm-tools/vgauth/lib/netPosix.c b/open-vm-tools/vgauth/lib/netPosix.c
index 8f0f0670e99cb15b4f2af468921e4d22e0bd0879..0deac8ac68ccf650c4af5eb4fd1267b756831312 100644 (file)
--- a/open-vm-tools/vgauth/lib/netPosix.c
+++ b/open-vm-tools/vgauth/lib/netPosix.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2011-2016 VMware, Inc. All rights reserved.
+ * Copyright (C) 2011-2016,2019 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
@@ -133,7 +133,7 @@ VGAuth_NetworkValidatePublicPipeOwner(VGAuthContext *ctx)
    gboolean retval = FALSE;
    int ret;
 
-#ifdef linux
+#ifdef __linux__
    struct ucred peerCred;
    socklen_t peerCredLen = sizeof peerCred;