Skip to content

Rename poll.h into vm_poll.h to fix build failure on musl #383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Rename poll.h into vm_poll.h to fix build failure on musl #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions open-vm-tools/lib/asyncsocket/asyncsocket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
#else
#include <stddef.h>
#include <ctype.h>
#include <poll.h>
#include <sys/types.h>
#include <sys/poll.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <netdb.h>
Expand All @@ -86,7 +86,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"
Expand Down
2 changes: 1 addition & 1 deletion open-vm-tools/lib/hgfsServer/hgfsServer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#include "hgfsServerOplock.h"
#include "hgfsDirNotify.h"
#include "userlock.h"
#include "poll.h"
#include "vm_poll.h"
#include "mutexRankLib.h"
#include "vm_basic_asm.h"
#include "unicodeOperations.h"
Expand Down
2 changes: 1 addition & 1 deletion open-vm-tools/lib/include/asyncsocket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,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 */
Expand Down
2 changes: 1 addition & 1 deletion open-vm-tools/lib/include/pollImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
0 open-vm-tools/lib/include/poll.h → open-vm-tools/lib/include/vm_poll.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion open-vm-tools/lib/rpcIn/rpcin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down