| From 7a5db1cf47e70e72d78a42468912c276e57f865e Mon Sep 17 00:00:00 2001 |
| From: Randy MacLeod <Randy.MacLeod@windriver.com> |
| Date: Wed, 24 Mar 2021 16:21:35 -0400 |
| Subject: [PATCH] Rename poll.h to vm_poll.h |
| |
| Rename poll.h to vm_poll.h and switch from: |
| #include <sys/poll.h> |
| to |
| #include <poll.h> |
| |
| musl libc's system headers pulls in open-vm-tools' poll.h. To avoid this |
| we rename poll.h to vm_poll.h. |
| |
| Update for open-vm-tools-11.2.5. |
| |
| Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> |
| --- |
| open-vm-tools/lib/asyncsocket/asyncsocket.c | 2 +- |
| open-vm-tools/lib/hgfsServer/hgfsServer.c | 2 +- |
| open-vm-tools/lib/include/asyncsocket.h | 2 +- |
| open-vm-tools/lib/include/pollImpl.h | 2 +- |
| open-vm-tools/lib/include/{poll.h => vm_poll.h} | 2 +- |
| open-vm-tools/lib/rpcIn/rpcin.c | 2 +- |
| 6 files changed, 6 insertions(+), 6 deletions(-) |
| rename open-vm-tools/lib/include/{poll.h => vm_poll.h} (99%) |
| |
| diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c b/open-vm-tools/lib/asyncsocket/asyncsocket.c |
| index 9914ffc5..89679f7a 100644 |
| --- a/open-vm-tools/lib/asyncsocket/asyncsocket.c |
| +++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c |
| @@ -87,7 +87,7 @@ |
| #include "random.h" |
| #include "asyncsocket.h" |
| #include "asyncSocketBase.h" |
| -#include "poll.h" |
| +#include "vm_poll.h" |
| #include "log.h" |
| #include "err.h" |
| #include "hostinfo.h" |
| diff --git a/open-vm-tools/lib/hgfsServer/hgfsServer.c b/open-vm-tools/lib/hgfsServer/hgfsServer.c |
| index 3a18a7e1..acdda54d 100644 |
| --- a/open-vm-tools/lib/hgfsServer/hgfsServer.c |
| +++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c |
| @@ -51,7 +51,7 @@ |
| #include "hgfsDirNotify.h" |
| #include "hgfsThreadpool.h" |
| #include "userlock.h" |
| -#include "poll.h" |
| +#include "vm_poll.h" |
| #include "mutexRankLib.h" |
| #include "vm_basic_asm.h" |
| #include "unicodeOperations.h" |
| diff --git a/open-vm-tools/lib/include/asyncsocket.h b/open-vm-tools/lib/include/asyncsocket.h |
| index 746dd78b..82c22f46 100644 |
| --- a/open-vm-tools/lib/include/asyncsocket.h |
| +++ b/open-vm-tools/lib/include/asyncsocket.h |
| @@ -171,7 +171,7 @@ typedef struct AsyncSocket AsyncSocket; |
| * Or the client can specify its favorite poll class and locking behavior. |
| * Use of IVmdbPoll is only supported for regular sockets and for Attach. |
| */ |
| -#include "poll.h" |
| +#include "vm_poll.h" |
| struct IVmdbPoll; |
| typedef struct AsyncSocketPollParams { |
| int flags; /* Default 0, only POLL_FLAG_NO_BULL is valid */ |
| diff --git a/open-vm-tools/lib/include/pollImpl.h b/open-vm-tools/lib/include/pollImpl.h |
| index 46442e55..8bc66997 100644 |
| --- a/open-vm-tools/lib/include/pollImpl.h |
| +++ b/open-vm-tools/lib/include/pollImpl.h |
| @@ -44,7 +44,7 @@ |
| #define INCLUDE_ALLOW_USERLEVEL |
| #include "includeCheck.h" |
| |
| -#include "poll.h" |
| +#include "vm_poll.h" |
| #include "vm_basic_asm.h" |
| |
| #if defined(__cplusplus) |
| diff --git a/open-vm-tools/lib/include/poll.h b/open-vm-tools/lib/include/vm_poll.h |
| similarity index 99% |
| rename from open-vm-tools/lib/include/poll.h |
| rename to open-vm-tools/lib/include/vm_poll.h |
| index c90f5dcd..73a56204 100644 |
| --- a/open-vm-tools/lib/include/poll.h |
| +++ b/open-vm-tools/lib/include/vm_poll.h |
| @@ -60,7 +60,7 @@ extern "C" { |
| #if !defined(TARGET_OS_IPHONE) || TARGET_OS_IPHONE == 0 |
| #include <sys/kernel.h> |
| #endif |
| -#include <sys/poll.h> |
| +#include <poll.h> |
| #define HZ 100 |
| #endif |
| #ifdef __ANDROID__ |
| diff --git a/open-vm-tools/lib/rpcIn/rpcin.c b/open-vm-tools/lib/rpcIn/rpcin.c |
| index 8b1fe759..f22fcd40 100644 |
| --- a/open-vm-tools/lib/rpcIn/rpcin.c |
| +++ b/open-vm-tools/lib/rpcIn/rpcin.c |
| @@ -57,7 +57,7 @@ |
| |
| #if defined(VMTOOLS_USE_VSOCKET) |
| # include <glib.h> |
| -# include "poll.h" |
| +# include "vm_poll.h" |
| # include "asyncsocket.h" |
| # include "vmci_defs.h" |
| #include "dataMap.h" |
| -- |
| 2.27.0 |
| |