Convert linux to __linux__ in preprocessor statements.

Linux ABI uses __linux__, not linux (deprecated).

diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
index f2b7ce67e1113a96e2e0ed90091a52e224ec1653..6f28291ff27695d8705a763a8879c955b3109a39 100644 (file)
--- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
+++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2018 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-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
@@ -85,7 +85,7 @@
 #include <sys/vnode.h>      // for VERG / VDIR
 #endif
 
-#ifdef linux
+#ifdef __linux__
 typedef struct DirectoryEntry {
    uint64 d_ino;
    uint64 d_off;
@@ -4193,7 +4193,7 @@ HgfsPlatformReadFile(fileDesc file,               // IN: file descriptor
    if (sequentialOpen) {
       error = 0; // No error from seek
    } else {
-#   ifdef linux
+#   ifdef __linux__
       {
          uint64 res;
 #      if !defined(VM_X86_64)
@@ -4296,7 +4296,7 @@ HgfsPlatformWriteFile(fileDesc writeFd,            // IN: file descriptor
 
    MXUser_AcquireExclLock(session->fileIOLock);
    if (!writeSequential) {
-#   ifdef linux
+#   ifdef __linux__
       {
          uint64 res;
 #      if !defined(VM_X86_64)

diff --git a/open-vm-tools/lib/include/poll.h b/open-vm-tools/lib/include/poll.h
index 6acd4f35ff10b54a199af2cd80eb7f323b1461f6..ef9281b49dde4e97cc5cd5fef5dfe276dd1c90c6 100644 (file)
--- a/open-vm-tools/lib/include/poll.h
+++ b/open-vm-tools/lib/include/poll.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2018 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-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
@@ -49,7 +49,7 @@ extern "C" {
 
 #ifdef _WIN32
 #define HZ 100
-#elif defined linux
+#elif defined __linux__
 #include <asm/param.h>
 #elif __APPLE__
 #include <TargetConditionals.h>