1From e86d7b309bdf5b7c6c38faeded157e220d4ccc78 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
16Upstream-Status: Pending
17
18Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
19Signed-off-by: Khem Raj <raj.khem@gmail.com>
20Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
21---
22 open-vm-tools/lib/asyncsocket/asyncsocket.c     | 2 +-
23 open-vm-tools/lib/hgfsServer/hgfsServer.c       | 2 +-
24 open-vm-tools/lib/include/asyncsocket.h         | 2 +-
25 open-vm-tools/lib/include/pollImpl.h            | 2 +-
26 open-vm-tools/lib/include/{poll.h => vm_poll.h} | 2 +-
27 open-vm-tools/lib/rpcIn/rpcin.c                 | 2 +-
28 6 files changed, 6 insertions(+), 6 deletions(-)
29 rename open-vm-tools/lib/include/{poll.h => vm_poll.h} (99%)
30
31diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c b/open-vm-tools/lib/asyncsocket/asyncsocket.c
32index 4f413db73..684008d34 100644
33--- a/open-vm-tools/lib/asyncsocket/asyncsocket.c
34+++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c
35@@ -87,7 +87,7 @@
36 #include "random.h"
37 #include "asyncsocket.h"
38 #include "asyncSocketBase.h"
39-#include "poll.h"
40+#include "vm_poll.h"
41 #include "log.h"
42 #include "err.h"
43 #include "hostinfo.h"
44diff --git a/open-vm-tools/lib/hgfsServer/hgfsServer.c b/open-vm-tools/lib/hgfsServer/hgfsServer.c
45index c7b4cdd0f..d6e0cdc0e 100644
46--- a/open-vm-tools/lib/hgfsServer/hgfsServer.c
47+++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c
48@@ -51,7 +51,7 @@
49 #include "hgfsDirNotify.h"
50 #include "hgfsThreadpool.h"
51 #include "userlock.h"
52-#include "poll.h"
53+#include "vm_poll.h"
54 #include "mutexRankLib.h"
55 #include "vm_basic_asm.h"
56 #include "unicodeOperations.h"
57diff --git a/open-vm-tools/lib/include/asyncsocket.h b/open-vm-tools/lib/include/asyncsocket.h
58index 09947002e..3800f5971 100644
59--- a/open-vm-tools/lib/include/asyncsocket.h
60+++ b/open-vm-tools/lib/include/asyncsocket.h
61@@ -177,7 +177,7 @@ typedef struct AsyncSocket AsyncSocket;
62  * Or the client can specify its favorite poll class and locking behavior.
63  * Use of IVmdbPoll is only supported for regular sockets and for Attach.
64  */
65-#include "poll.h"
66+#include "vm_poll.h"
67 struct IVmdbPoll;
68 typedef struct AsyncSocketPollParams {
69    int flags;               /* Default 0, only POLL_FLAG_NO_BULL is valid */
70diff --git a/open-vm-tools/lib/include/pollImpl.h b/open-vm-tools/lib/include/pollImpl.h
71index 46442e556..8bc669970 100644
72--- a/open-vm-tools/lib/include/pollImpl.h
73+++ b/open-vm-tools/lib/include/pollImpl.h
74@@ -44,7 +44,7 @@
75 #define INCLUDE_ALLOW_USERLEVEL
76 #include "includeCheck.h"
77
78-#include "poll.h"
79+#include "vm_poll.h"
80 #include "vm_basic_asm.h"
81
82 #if defined(__cplusplus)
83diff --git a/open-vm-tools/lib/include/poll.h b/open-vm-tools/lib/include/vm_poll.h
84similarity index 99%
85rename from open-vm-tools/lib/include/poll.h
86rename to open-vm-tools/lib/include/vm_poll.h
87index ade356b9f..8759fb960 100644
88--- a/open-vm-tools/lib/include/poll.h
89+++ b/open-vm-tools/lib/include/vm_poll.h
90@@ -60,7 +60,7 @@ extern "C" {
91 #if !defined(TARGET_OS_IPHONE) || TARGET_OS_IPHONE == 0
92 #include <sys/kernel.h>
93 #endif
94-#include <sys/poll.h>
95+#include <poll.h>
96 #define HZ 100
97 #endif
98 #ifdef __ANDROID__
99diff --git a/open-vm-tools/lib/rpcIn/rpcin.c b/open-vm-tools/lib/rpcIn/rpcin.c
100index f1709fe03..c1a5dfdba 100644
101--- a/open-vm-tools/lib/rpcIn/rpcin.c
102+++ b/open-vm-tools/lib/rpcIn/rpcin.c
103@@ -57,7 +57,7 @@
104
105 #if defined(VMTOOLS_USE_VSOCKET)
106 #  include <glib.h>
107-#  include "poll.h"
108+#  include "vm_poll.h"
109 #  include "asyncsocket.h"
110 #  include "vmci_defs.h"
111 #include "dataMap.h"
112--
1132.25.1
114
115