You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
59 lines
1.6 KiB
59 lines
1.6 KiB
--- 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
|
|
@@ -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 */
|
|
--- 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)
|
|
diff --git a/lib/include/poll.h b/lib/include/vm_poll.h
|
|
rename from lib/include/poll.h
|
|
rename to lib/include/vm_poll.h
|
|
diff --git a/lib/rpcIn/rpcin.c b/lib/rpcIn/rpcin.c
|
|
--- 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"
|