utils/open-vm-tools/patches/0008-Rename-poll.h-to-vm_poll.h.patch

   1 From 5b45a812a5a3e9509021043f83529cccc13af26a Mon Sep 17 00:00:00 2001
   2 From: Natanael Copa <ncopa@alpinelinux.org>
   3 Date: Tue, 17 Nov 2015 10:57:31 +0000
   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 ---
  11  lib/asyncsocket/asyncsocket.c     | 2 +-
  12  lib/hgfsServer/hgfsServer.c       | 2 +-
  13  lib/include/asyncsocket.h         | 2 +-
  14  lib/include/pollImpl.h            | 2 +-
  15  lib/include/{poll.h => vm_poll.h} | 0
  16  lib/rpcIn/rpcin.c                 | 2 +-
  17  6 files changed, 5 insertions(+), 5 deletions(-)
  18
  19 --- a/lib/asyncsocket/asyncsocket.c
  20 +++ b/lib/asyncsocket/asyncsocket.c
  21 @@ -87,7 +87,7 @@
  22  #include "random.h"
  23  #include "asyncsocket.h"
  24  #include "asyncSocketBase.h"
  25 -#include "poll.h"
  26 +#include "vm_poll.h"
  27  #include "log.h"
  28  #include "err.h"
  29  #include "hostinfo.h"
  30 --- a/lib/hgfsServer/hgfsServer.c
  31 +++ b/lib/hgfsServer/hgfsServer.c
  32 @@ -51,7 +51,7 @@
  33  #include "hgfsDirNotify.h"
  34  #include "hgfsThreadpool.h"
  35  #include "userlock.h"
  36 -#include "poll.h"
  37 +#include "vm_poll.h"
  38  #include "mutexRankLib.h"
  39  #include "vm_basic_asm.h"
  40  #include "unicodeOperations.h"
  41 --- a/lib/include/asyncsocket.h
  42 +++ b/lib/include/asyncsocket.h
  43 @@ -171,7 +171,7 @@ typedef struct AsyncSocket AsyncSocket;
  44   * Or the client can specify its favorite poll class and locking behavior.
  45   * Use of IVmdbPoll is only supported for regular sockets and for Attach.
  46   */
  47 -#include "poll.h"
  48 +#include "vm_poll.h"
  49  struct IVmdbPoll;
  50  typedef struct AsyncSocketPollParams {
  51     int flags;               /* Default 0, only POLL_FLAG_NO_BULL is valid */
  52 --- a/lib/include/pollImpl.h
  53 +++ b/lib/include/pollImpl.h
  54 @@ -44,7 +44,7 @@
  55  #define INCLUDE_ALLOW_USERLEVEL
  56  #include "includeCheck.h"
  57
  58 -#include "poll.h"
  59 +#include "vm_poll.h"
  60  #include "vm_basic_asm.h"
  61
  62  #if defined(__cplusplus)
  63 --- a/lib/rpcIn/rpcin.c
  64 +++ b/lib/rpcIn/rpcin.c
  65 @@ -57,7 +57,7 @@
  66
  67  #if defined(VMTOOLS_USE_VSOCKET)
  68  #  include <glib.h>
  69 -#  include "poll.h"
  70 +#  include "vm_poll.h"
  71  #  include "asyncsocket.h"
  72  #  include "vmci_defs.h"
  73  #include "dataMap.h"