From: Oliver Kurth Date: Sun, 21 Jul 2019 00:15:19 +0000 (-0700) Subject: Partial change linux -> __linux__, Tools edition X-Git-Tag: stable-11.1.0~307 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=364f63ee833770889391e70d5f75683a5eaf3e46;p=thirdparty%2Fopen-vm-tools.git 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 55dc07e10..80273f817 100644 --- 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 diff --git a/open-vm-tools/lib/nicInfo/nicInfo.c b/open-vm-tools/lib/nicInfo/nicInfo.c index ce9ebae38..694a9a056 100644 --- 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 1fac8024c..c929722e7 100644 --- 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 74a050698..b8ce9f65e 100644 --- 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 5fff105f6..188c2576b 100644 --- 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 861e92b16..deb56c666 100644 --- 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 44bca5cbd..780729c2b 100644 --- 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 #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 664b28538..fd0f495ef 100644 --- 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 8f0f0670e..0deac8ac6 100644 --- 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;