diff options
author | Jeremy Allison <jra@samba.org> | 2011-02-28 12:25:40 -0800 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2011-02-28 21:58:20 +0100 |
commit | 410f9fad6c49e1af4e9700331aa2e1ed16f51b27 (patch) | |
tree | adbb7e3b8a2e3b6a3e231b3a16ccb9a9d2549b85 /lib | |
parent | b077ccccfba22310862d6a600a41a6ab1130dc1a (diff) | |
download | samba-410f9fad6c49e1af4e9700331aa2e1ed16f51b27.tar.gz samba-410f9fad6c49e1af4e9700331aa2e1ed16f51b27.tar.bz2 samba-410f9fad6c49e1af4e9700331aa2e1ed16f51b27.zip |
Fix "cast from pointer to integer of different size" warnings on a 64-bit machine.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/tevent/tevent_poll.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/tevent/tevent_poll.c b/lib/tevent/tevent_poll.c index c133194072..cda028a964 100644 --- a/lib/tevent/tevent_poll.c +++ b/lib/tevent/tevent_poll.c @@ -64,7 +64,7 @@ static int poll_event_fd_destructor(struct tevent_fd *fde) struct tevent_context *ev = fde->event_ctx; struct poll_event_context *poll_ev = NULL; struct tevent_fd *moved_fde; - int del_idx; + long del_idx; if (ev == NULL) { goto done; @@ -76,7 +76,7 @@ static int poll_event_fd_destructor(struct tevent_fd *fde) /* * Assume a void * can carry enough bits to hold num_fds. */ - del_idx = (int)(fde->additional_data); + del_idx = (long)(fde->additional_data); moved_fde = poll_ev->fd_events[poll_ev->num_fds-1]; poll_ev->fd_events[del_idx] = moved_fde; @@ -152,7 +152,7 @@ static struct tevent_fd *poll_event_add_fd(struct tevent_context *ev, /* * Assume a void * can carry enough bits to hold num_fds. */ - fde->additional_data = (void *)poll_ev->num_fds; + fde->additional_data = (void *)(long)poll_ev->num_fds; poll_ev->fd_events[poll_ev->num_fds] = fde; poll_ev->num_fds += 1; @@ -169,7 +169,7 @@ static void poll_event_set_fd_flags(struct tevent_fd *fde, uint16_t flags) { struct poll_event_context *poll_ev = talloc_get_type_abort( fde->event_ctx->additional_data, struct poll_event_context); - int idx; + long idx; uint16_t pollflags = 0; if (flags & TEVENT_FD_READ) { @@ -179,7 +179,7 @@ static void poll_event_set_fd_flags(struct tevent_fd *fde, uint16_t flags) pollflags |= (POLLOUT); } - idx = (int)(fde->additional_data); + idx = (long)(fde->additional_data); poll_ev->fds[idx].events = pollflags; fde->flags = flags; @@ -237,10 +237,10 @@ static int poll_event_loop_poll(struct tevent_context *ev, the handler to remove itself when called */ for (fde = ev->fd_events; fde; fde = fde->next) { struct pollfd *pfd; - int pfd_idx; + long pfd_idx; uint16_t flags = 0; - pfd_idx = (int)(fde->additional_data); + pfd_idx = (long)(fde->additional_data); pfd = &poll_ev->fds[pfd_idx]; |