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.

55 lines
1.5 KiB

  1. --- a/lib/asyncsocket/asyncsocket.c
  2. +++ b/lib/asyncsocket/asyncsocket.c
  3. @@ -87,7 +87,7 @@
  4. #include "random.h"
  5. #include "asyncsocket.h"
  6. #include "asyncSocketBase.h"
  7. -#include "poll.h"
  8. +#include "vm_poll.h"
  9. #include "log.h"
  10. #include "err.h"
  11. #include "hostinfo.h"
  12. --- a/lib/hgfsServer/hgfsServer.c
  13. +++ b/lib/hgfsServer/hgfsServer.c
  14. @@ -51,7 +51,7 @@
  15. #include "hgfsDirNotify.h"
  16. #include "hgfsThreadpool.h"
  17. #include "userlock.h"
  18. -#include "poll.h"
  19. +#include "vm_poll.h"
  20. #include "mutexRankLib.h"
  21. #include "vm_basic_asm.h"
  22. #include "unicodeOperations.h"
  23. --- a/lib/include/asyncsocket.h
  24. +++ b/lib/include/asyncsocket.h
  25. @@ -171,7 +171,7 @@ typedef struct AsyncSocket AsyncSocket;
  26. * Or the client can specify its favorite poll class and locking behavior.
  27. * Use of IVmdbPoll is only supported for regular sockets and for Attach.
  28. */
  29. -#include "poll.h"
  30. +#include "vm_poll.h"
  31. struct IVmdbPoll;
  32. typedef struct AsyncSocketPollParams {
  33. int flags; /* Default 0, only POLL_FLAG_NO_BULL is valid */
  34. --- a/lib/include/pollImpl.h
  35. +++ b/lib/include/pollImpl.h
  36. @@ -44,7 +44,7 @@
  37. #define INCLUDE_ALLOW_USERLEVEL
  38. #include "includeCheck.h"
  39. -#include "poll.h"
  40. +#include "vm_poll.h"
  41. #include "vm_basic_asm.h"
  42. #if defined(__cplusplus)
  43. --- a/lib/rpcIn/rpcin.c
  44. +++ b/lib/rpcIn/rpcin.c
  45. @@ -57,7 +57,7 @@
  46. #if defined(VMTOOLS_USE_VSOCKET)
  47. # include <glib.h>
  48. -# include "poll.h"
  49. +# include "vm_poll.h"
  50. # include "asyncsocket.h"
  51. # include "vmci_defs.h"
  52. #include "dataMap.h"