1From 0c695d910b3e136e116cdbe0bfc6231dfac255a1 Mon Sep 17 00:00:00 2001 2From: Randy MacLeod <Randy.MacLeod@windriver.com> 3Date: Wed, 24 Mar 2021 16:21:35 -0400 4Subject: [PATCH] Rename poll.h to vm_poll.h 5 6Rename poll.h to vm_poll.h and switch from: 7 #include <sys/poll.h> 8to 9 #include <poll.h> 10 11musl libc's system headers pulls in open-vm-tools' poll.h. To avoid this 12we rename poll.h to vm_poll.h. 13 14Update for open-vm-tools-11.2.5. 15 16Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> 17Signed-off-by: Khem Raj <raj.khem@gmail.com> 18Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> 19--- 20 open-vm-tools/lib/asyncsocket/asyncsocket.c | 2 +- 21 open-vm-tools/lib/hgfsServer/hgfsServer.c | 2 +- 22 open-vm-tools/lib/include/asyncsocket.h | 2 +- 23 open-vm-tools/lib/include/pollImpl.h | 2 +- 24 open-vm-tools/lib/include/{poll.h => vm_poll.h} | 2 +- 25 open-vm-tools/lib/rpcIn/rpcin.c | 2 +- 26 6 files changed, 6 insertions(+), 6 deletions(-) 27 rename open-vm-tools/lib/include/{poll.h => vm_poll.h} (99%) 28 29diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c b/open-vm-tools/lib/asyncsocket/asyncsocket.c 30index b285c59c6..5c528820d 100644 31--- a/open-vm-tools/lib/asyncsocket/asyncsocket.c 32+++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c 33@@ -87,7 +87,7 @@ 34 #include "random.h" 35 #include "asyncsocket.h" 36 #include "asyncSocketBase.h" 37-#include "poll.h" 38+#include "vm_poll.h" 39 #include "log.h" 40 #include "err.h" 41 #include "hostinfo.h" 42diff --git a/open-vm-tools/lib/hgfsServer/hgfsServer.c b/open-vm-tools/lib/hgfsServer/hgfsServer.c 43index 98f5b3f06..b436f0c7e 100644 44--- a/open-vm-tools/lib/hgfsServer/hgfsServer.c 45+++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c 46@@ -51,7 +51,7 @@ 47 #include "hgfsDirNotify.h" 48 #include "hgfsThreadpool.h" 49 #include "userlock.h" 50-#include "poll.h" 51+#include "vm_poll.h" 52 #include "mutexRankLib.h" 53 #include "vm_basic_asm.h" 54 #include "unicodeOperations.h" 55diff --git a/open-vm-tools/lib/include/asyncsocket.h b/open-vm-tools/lib/include/asyncsocket.h 56index dad848093..b61a2561f 100644 57--- a/open-vm-tools/lib/include/asyncsocket.h 58+++ b/open-vm-tools/lib/include/asyncsocket.h 59@@ -171,7 +171,7 @@ typedef struct AsyncSocket AsyncSocket; 60 * Or the client can specify its favorite poll class and locking behavior. 61 * Use of IVmdbPoll is only supported for regular sockets and for Attach. 62 */ 63-#include "poll.h" 64+#include "vm_poll.h" 65 struct IVmdbPoll; 66 typedef struct AsyncSocketPollParams { 67 int flags; /* Default 0, only POLL_FLAG_NO_BULL is valid */ 68diff --git a/open-vm-tools/lib/include/pollImpl.h b/open-vm-tools/lib/include/pollImpl.h 69index 46442e556..8bc669970 100644 70--- a/open-vm-tools/lib/include/pollImpl.h 71+++ b/open-vm-tools/lib/include/pollImpl.h 72@@ -44,7 +44,7 @@ 73 #define INCLUDE_ALLOW_USERLEVEL 74 #include "includeCheck.h" 75 76-#include "poll.h" 77+#include "vm_poll.h" 78 #include "vm_basic_asm.h" 79 80 #if defined(__cplusplus) 81diff --git a/open-vm-tools/lib/include/poll.h b/open-vm-tools/lib/include/vm_poll.h 82similarity index 99% 83rename from open-vm-tools/lib/include/poll.h 84rename to open-vm-tools/lib/include/vm_poll.h 85index ade356b9f..8759fb960 100644 86--- a/open-vm-tools/lib/include/poll.h 87+++ b/open-vm-tools/lib/include/vm_poll.h 88@@ -60,7 +60,7 @@ extern "C" { 89 #if !defined(TARGET_OS_IPHONE) || TARGET_OS_IPHONE == 0 90 #include <sys/kernel.h> 91 #endif 92-#include <sys/poll.h> 93+#include <poll.h> 94 #define HZ 100 95 #endif 96 #ifdef __ANDROID__ 97diff --git a/open-vm-tools/lib/rpcIn/rpcin.c b/open-vm-tools/lib/rpcIn/rpcin.c 98index 8b1fe759d..f22fcd402 100644 99--- a/open-vm-tools/lib/rpcIn/rpcin.c 100+++ b/open-vm-tools/lib/rpcIn/rpcin.c 101@@ -57,7 +57,7 @@ 102 103 #if defined(VMTOOLS_USE_VSOCKET) 104 # include <glib.h> 105-# include "poll.h" 106+# include "vm_poll.h" 107 # include "asyncsocket.h" 108 # include "vmci_defs.h" 109 #include "dataMap.h" 110-- 1112.25.1 112 113