74 lines
2.1 KiB
Diff
74 lines
2.1 KiB
Diff
From 5b45a812a5a3e9509021043f83529cccc13af26a Mon Sep 17 00:00:00 2001
|
|
From: Natanael Copa <ncopa@alpinelinux.org>
|
|
Date: Tue, 17 Nov 2015 10:57:31 +0000
|
|
Subject: [PATCH] Rename poll.h to vm_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.
|
|
|
|
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
|
|
---
|
|
lib/asyncsocket/asyncsocket.c | 2 +-
|
|
lib/hgfsServer/hgfsServer.c | 2 +-
|
|
lib/include/asyncsocket.h | 2 +-
|
|
lib/include/pollImpl.h | 2 +-
|
|
lib/include/{poll.h => vm_poll.h} | 0
|
|
lib/rpcIn/rpcin.c | 2 +-
|
|
6 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
--- a/lib/asyncsocket/asyncsocket.c
|
|
+++ b/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"
|
|
--- a/lib/hgfsServer/hgfsServer.c
|
|
+++ b/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"
|
|
--- a/lib/include/asyncsocket.h
|
|
+++ b/lib/include/asyncsocket.h
|
|
@@ -175,7 +175,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 */
|
|
--- a/lib/include/pollImpl.h
|
|
+++ b/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)
|
|
--- a/lib/rpcIn/rpcin.c
|
|
+++ b/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"
|