Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 92955b3a6180b4285d11ef79766df01b9ab60dbd Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 13 Jun 2018 23:11:58 -0700 |
| 4 | Subject: [PATCH] Rename poll.h to vm_poll.h |
| 5 | |
| 6 | musl libc's system headers pulls in open-vm-tools' poll.h. To avoid this |
| 7 | we rename poll.h to vm_poll.h. |
| 8 | |
| 9 | Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- |
| 12 | open-vm-tools/lib/asyncsocket/asyncsocket.c | 2 +- |
| 13 | open-vm-tools/lib/hgfsServer/hgfsServer.c | 2 +- |
| 14 | open-vm-tools/lib/include/asyncsocket.h | 2 +- |
| 15 | open-vm-tools/lib/include/pollImpl.h | 2 +- |
| 16 | open-vm-tools/lib/include/{poll.h => vm_poll.h} | 2 +- |
| 17 | open-vm-tools/lib/rpcIn/rpcin.c | 2 +- |
| 18 | .../services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c | 2 +- |
| 19 | 7 files changed, 7 insertions(+), 7 deletions(-) |
| 20 | rename open-vm-tools/lib/include/{poll.h => vm_poll.h} (99%) |
| 21 | |
| 22 | diff --git a/lib/asyncsocket/asyncsocket.c b/lib/asyncsocket/asyncsocket.c |
| 23 | index e0a68e7e..b9675674 100644 |
| 24 | --- a/lib/asyncsocket/asyncsocket.c |
| 25 | +++ b/lib/asyncsocket/asyncsocket.c |
| 26 | @@ -86,7 +86,7 @@ |
| 27 | #include "random.h" |
| 28 | #include "asyncsocket.h" |
| 29 | #include "asyncSocketBase.h" |
| 30 | -#include "poll.h" |
| 31 | +#include "vm_poll.h" |
| 32 | #include "log.h" |
| 33 | #include "err.h" |
| 34 | #include "hostinfo.h" |
| 35 | diff --git a/lib/hgfsServer/hgfsServer.c b/lib/hgfsServer/hgfsServer.c |
| 36 | index 991a7941..ed0c09f9 100644 |
| 37 | --- a/lib/hgfsServer/hgfsServer.c |
| 38 | +++ b/lib/hgfsServer/hgfsServer.c |
| 39 | @@ -48,7 +48,7 @@ |
| 40 | #include "hgfsServerOplock.h" |
| 41 | #include "hgfsDirNotify.h" |
| 42 | #include "userlock.h" |
| 43 | -#include "poll.h" |
| 44 | +#include "vm_poll.h" |
| 45 | #include "mutexRankLib.h" |
| 46 | #include "vm_basic_asm.h" |
| 47 | #include "unicodeOperations.h" |
| 48 | diff --git a/lib/include/asyncsocket.h b/lib/include/asyncsocket.h |
| 49 | index 524147ea..103f944f 100644 |
| 50 | --- a/lib/include/asyncsocket.h |
| 51 | +++ b/lib/include/asyncsocket.h |
| 52 | @@ -164,7 +164,7 @@ typedef struct AsyncSocket AsyncSocket; |
| 53 | * Or the client can specify its favorite poll class and locking behavior. |
| 54 | * Use of IVmdbPoll is only supported for regular sockets and for Attach. |
| 55 | */ |
| 56 | -#include "poll.h" |
| 57 | +#include "vm_poll.h" |
| 58 | struct IVmdbPoll; |
| 59 | typedef struct AsyncSocketPollParams { |
| 60 | int flags; /* Default 0, only POLL_FLAG_NO_BULL is valid */ |
| 61 | diff --git a/lib/include/pollImpl.h b/lib/include/pollImpl.h |
| 62 | index 46442e55..8bc66997 100644 |
| 63 | --- a/lib/include/pollImpl.h |
| 64 | +++ b/lib/include/pollImpl.h |
| 65 | @@ -44,7 +44,7 @@ |
| 66 | #define INCLUDE_ALLOW_USERLEVEL |
| 67 | #include "includeCheck.h" |
| 68 | |
| 69 | -#include "poll.h" |
| 70 | +#include "vm_poll.h" |
| 71 | #include "vm_basic_asm.h" |
| 72 | |
| 73 | #if defined(__cplusplus) |
| 74 | diff --git a/lib/include/poll.h b/lib/include/vm_poll.h |
| 75 | similarity index 99% |
| 76 | rename from open-vm-tools/lib/include/poll.h |
| 77 | rename to open-vm-tools/lib/include/vm_poll.h |
| 78 | index 988fe6d0..e9e74fb5 100644 |
| 79 | --- a/lib/include/poll.h |
| 80 | +++ b/lib/include/vm_poll.h |
| 81 | @@ -60,7 +60,7 @@ extern "C" { |
| 82 | #if !defined(TARGET_OS_IPHONE) || TARGET_OS_IPHONE == 0 |
| 83 | #include <sys/kernel.h> |
| 84 | #endif |
| 85 | -#include <sys/poll.h> |
| 86 | +#include <poll.h> |
| 87 | #define HZ 100 |
| 88 | #endif |
| 89 | #ifdef __ANDROID__ |
| 90 | diff --git a/lib/rpcIn/rpcin.c b/lib/rpcIn/rpcin.c |
| 91 | index c2c51583..d6c62f10 100644 |
| 92 | --- a/lib/rpcIn/rpcin.c |
| 93 | +++ b/lib/rpcIn/rpcin.c |
| 94 | @@ -57,7 +57,7 @@ |
| 95 | |
| 96 | #if defined(VMTOOLS_USE_VSOCKET) |
| 97 | # include <glib.h> |
| 98 | -# include "poll.h" |
| 99 | +# include "vm_poll.h" |
| 100 | # include "asyncsocket.h" |
| 101 | # include "vmci_defs.h" |
| 102 | #include "dataMap.h" |
| 103 | diff --git a/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c b/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c |
| 104 | index 03700937..f0b49ad7 100644 |
| 105 | --- a/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c |
| 106 | +++ b/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c |
| 107 | @@ -48,7 +48,7 @@ |
| 108 | #include "rpcout.h" |
| 109 | #include "rabbitmqProxyConst.h" |
| 110 | #include "vm_basic_types.h" |
| 111 | -#include "poll.h" |
| 112 | +#include "vm_poll.h" |
| 113 | #ifdef OPEN_VM_TOOLS |
| 114 | #include "vmci_sockets.h" |
| 115 | #include "sslDirect.h" |