Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 1 | From 0c695d910b3e136e116cdbe0bfc6231dfac255a1 Mon Sep 17 00:00:00 2001 |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 2 | From: Randy MacLeod <Randy.MacLeod@windriver.com> |
| 3 | Date: Wed, 24 Mar 2021 16:21:35 -0400 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 4 | Subject: [PATCH] Rename poll.h to vm_poll.h |
| 5 | |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 6 | Rename poll.h to vm_poll.h and switch from: |
| 7 | #include <sys/poll.h> |
| 8 | to |
| 9 | #include <poll.h> |
| 10 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 11 | musl libc's system headers pulls in open-vm-tools' poll.h. To avoid this |
| 12 | we rename poll.h to vm_poll.h. |
| 13 | |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 14 | Update for open-vm-tools-11.2.5. |
| 15 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 16 | Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> |
| 17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 18 | Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 19 | --- |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 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(-) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 27 | rename open-vm-tools/lib/include/{poll.h => vm_poll.h} (99%) |
| 28 | |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 29 | diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c b/open-vm-tools/lib/asyncsocket/asyncsocket.c |
Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 30 | index b285c59c6..5c528820d 100644 |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 31 | --- a/open-vm-tools/lib/asyncsocket/asyncsocket.c |
| 32 | +++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 33 | @@ -87,7 +87,7 @@ |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 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" |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 42 | diff --git a/open-vm-tools/lib/hgfsServer/hgfsServer.c b/open-vm-tools/lib/hgfsServer/hgfsServer.c |
Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 43 | index 98f5b3f06..b436f0c7e 100644 |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 44 | --- a/open-vm-tools/lib/hgfsServer/hgfsServer.c |
| 45 | +++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 46 | @@ -51,7 +51,7 @@ |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 47 | #include "hgfsDirNotify.h" |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 48 | #include "hgfsThreadpool.h" |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 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" |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 55 | diff --git a/open-vm-tools/lib/include/asyncsocket.h b/open-vm-tools/lib/include/asyncsocket.h |
Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 56 | index dad848093..b61a2561f 100644 |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 57 | --- a/open-vm-tools/lib/include/asyncsocket.h |
| 58 | +++ b/open-vm-tools/lib/include/asyncsocket.h |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 59 | @@ -171,7 +171,7 @@ typedef struct AsyncSocket AsyncSocket; |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 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 */ |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 68 | diff --git a/open-vm-tools/lib/include/pollImpl.h b/open-vm-tools/lib/include/pollImpl.h |
Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 69 | index 46442e556..8bc669970 100644 |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 70 | --- a/open-vm-tools/lib/include/pollImpl.h |
| 71 | +++ b/open-vm-tools/lib/include/pollImpl.h |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 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) |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 81 | diff --git a/open-vm-tools/lib/include/poll.h b/open-vm-tools/lib/include/vm_poll.h |
| 82 | similarity index 99% |
| 83 | rename from open-vm-tools/lib/include/poll.h |
| 84 | rename to open-vm-tools/lib/include/vm_poll.h |
Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 85 | index ade356b9f..8759fb960 100644 |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 86 | --- a/open-vm-tools/lib/include/poll.h |
Brad Bishop | 2d39a06 | 2019-10-28 08:33:36 -0400 | [diff] [blame] | 87 | +++ b/open-vm-tools/lib/include/vm_poll.h |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 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> |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 93 | +#include <poll.h> |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 94 | #define HZ 100 |
| 95 | #endif |
| 96 | #ifdef __ANDROID__ |
| 97 | diff --git a/open-vm-tools/lib/rpcIn/rpcin.c b/open-vm-tools/lib/rpcIn/rpcin.c |
Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 98 | index 8b1fe759d..f22fcd402 100644 |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 99 | --- a/open-vm-tools/lib/rpcIn/rpcin.c |
| 100 | +++ b/open-vm-tools/lib/rpcIn/rpcin.c |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 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" |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 110 | -- |
Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 111 | 2.25.1 |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 112 | |