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.

94 lines
2.8 KiB

  1. diff --git a/lib/asyncsocket/asyncsocket.c b/lib/asyncsocket/asyncsocket.c
  2. index e0a68e7e..b9675674 100644
  3. --- a/lib/asyncsocket/asyncsocket.c
  4. +++ b/lib/asyncsocket/asyncsocket.c
  5. @@ -86,7 +86,7 @@
  6. #include "random.h"
  7. #include "asyncsocket.h"
  8. #include "asyncSocketBase.h"
  9. -#include "poll.h"
  10. +#include "vm_poll.h"
  11. #include "log.h"
  12. #include "err.h"
  13. #include "hostinfo.h"
  14. diff --git a/lib/hgfsServer/hgfsServer.c b/lib/hgfsServer/hgfsServer.c
  15. index 991a7941..ed0c09f9 100644
  16. --- a/lib/hgfsServer/hgfsServer.c
  17. +++ b/lib/hgfsServer/hgfsServer.c
  18. @@ -48,7 +48,7 @@
  19. #include "hgfsServerOplock.h"
  20. #include "hgfsDirNotify.h"
  21. #include "userlock.h"
  22. -#include "poll.h"
  23. +#include "vm_poll.h"
  24. #include "mutexRankLib.h"
  25. #include "vm_basic_asm.h"
  26. #include "unicodeOperations.h"
  27. diff --git a/lib/include/asyncsocket.h b/lib/include/asyncsocket.h
  28. index 524147ea..103f944f 100644
  29. --- a/lib/include/asyncsocket.h
  30. +++ b/lib/include/asyncsocket.h
  31. @@ -164,7 +164,7 @@ typedef struct AsyncSocket AsyncSocket;
  32. * Or the client can specify its favorite poll class and locking behavior.
  33. * Use of IVmdbPoll is only supported for regular sockets and for Attach.
  34. */
  35. -#include "poll.h"
  36. +#include "vm_poll.h"
  37. struct IVmdbPoll;
  38. typedef struct AsyncSocketPollParams {
  39. int flags; /* Default 0, only POLL_FLAG_NO_BULL is valid */
  40. diff --git a/lib/include/pollImpl.h b/lib/include/pollImpl.h
  41. index 46442e55..8bc66997 100644
  42. --- a/lib/include/pollImpl.h
  43. +++ b/lib/include/pollImpl.h
  44. @@ -44,7 +44,7 @@
  45. #define INCLUDE_ALLOW_USERLEVEL
  46. #include "includeCheck.h"
  47. -#include "poll.h"
  48. +#include "vm_poll.h"
  49. #include "vm_basic_asm.h"
  50. #if defined(__cplusplus)
  51. diff --git a/lib/include/poll.h b/lib/include/vm_poll.h
  52. similarity index 99%
  53. rename from a/lib/include/poll.h
  54. rename to a/lib/include/vm_poll.h
  55. index 988fe6d0..e9e74fb5 100644
  56. --- a/lib/include/poll.h
  57. +++ b/lib/include/vm_poll.h
  58. @@ -60,7 +60,7 @@ extern "C" {
  59. #if !defined(TARGET_OS_IPHONE) || TARGET_OS_IPHONE == 0
  60. #include <sys/kernel.h>
  61. #endif
  62. -#include <sys/poll.h>
  63. +#include <poll.h>
  64. #define HZ 100
  65. #endif
  66. #ifdef __ANDROID__
  67. diff --git a/lib/rpcIn/rpcin.c b/lib/rpcIn/rpcin.c
  68. index c2c51583..d6c62f10 100644
  69. --- a/lib/rpcIn/rpcin.c
  70. +++ b/lib/rpcIn/rpcin.c
  71. @@ -57,7 +57,7 @@
  72. #if defined(VMTOOLS_USE_VSOCKET)
  73. # include <glib.h>
  74. -# include "poll.h"
  75. +# include "vm_poll.h"
  76. # include "asyncsocket.h"
  77. # include "vmci_defs.h"
  78. #include "dataMap.h"
  79. diff --git a/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c b/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c
  80. index 03700937..f0b49ad7 100644
  81. --- a/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c
  82. +++ b/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c
  83. @@ -48,7 +48,7 @@
  84. #include "rpcout.h"
  85. #include "rabbitmqProxyConst.h"
  86. #include "vm_basic_types.h"
  87. -#include "poll.h"
  88. +#include "vm_poll.h"
  89. #ifdef OPEN_VM_TOOLS
  90. #include "vmci_sockets.h"
  91. #include "sslDirect.h"