diff options
| author | Redirect 'Slash' NIL <redirect.slash.nil@gmail.com> | 2009-10-17 22:18:38 -0700 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2009-10-17 22:18:38 -0700 |
| commit | 990f50a73bca9f9fe4f261161b25fb8fb4432e52 (patch) | |
| tree | 2795ccc915c9627bd2a194c998586cee9a417ab3 | |
| parent | 5cf0af002c27e8e73c12f11ff1806f1d33c20b98 (diff) | |
| download | openocd+libswd-990f50a73bca9f9fe4f261161b25fb8fb4432e52.tar.gz openocd+libswd-990f50a73bca9f9fe4f261161b25fb8fb4432e52.tar.bz2 openocd+libswd-990f50a73bca9f9fe4f261161b25fb8fb4432e52.tar.xz openocd+libswd-990f50a73bca9f9fe4f261161b25fb8fb4432e52.zip | |
safer conversion to HANDLER on MinGW-W64
Assign to "intptr_t", which on some versions of MS-Windows
will widen the variable; then cast to HANDLE.
| -rw-r--r-- | src/helper/replacements.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/helper/replacements.c b/src/helper/replacements.c index 77e4ee7a..ef20e771 100644 --- a/src/helper/replacements.c +++ b/src/helper/replacements.c @@ -169,7 +169,7 @@ int win_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct time /* build an array of handles for non-sockets */ for (i = 0; i < max_fd; i++) { if (SAFE_FD_ISSET(i, rfds) || SAFE_FD_ISSET(i, wfds) || SAFE_FD_ISSET(i, efds)) { - long handle = _get_osfhandle(i); + intptr_t handle = (intptr_t) _get_osfhandle(i); handles[n_handles] = (HANDLE)handle; if (handles[n_handles] == INVALID_HANDLE_VALUE) { /* socket */ @@ -244,7 +244,7 @@ int win_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct time if (WAIT_OBJECT_0 == WaitForSingleObject(handles[i], 0)) { if (SAFE_FD_ISSET(handle_slot_to_fd[i], rfds)) { DWORD dwBytes; - long handle = _get_osfhandle(handle_slot_to_fd[i]); + intptr_t handle = (intptr_t) _get_osfhandle(handle_slot_to_fd[i]); if (PeekNamedPipe((HANDLE)handle, NULL, 0, NULL, &dwBytes, NULL)) { |