X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fhelper%2Freplacements.c;h=cc0c242aeac5c1d64e3bcc6edea4f3c894dc717e;hb=85f97341032177d4cc909377edb3580bc6a57245;hp=39a736c7c4336e2d26c3684f3c81ad223a058999;hpb=ab87627c5c4154a3e30108f7e4dd07f5d95c4390;p=openocd diff --git a/src/helper/replacements.c b/src/helper/replacements.c index 39a736c7..cc0c242a 100644 --- a/src/helper/replacements.c +++ b/src/helper/replacements.c @@ -64,6 +64,7 @@ void *fill_malloc(size_t size) return t; } +#define IN_REPLACEMENTS_C #include "replacements.h" #include @@ -172,7 +173,8 @@ 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)) { - handles[n_handles] = (HANDLE)_get_osfhandle(i); + long handle = _get_osfhandle(i); + handles[n_handles] = (HANDLE)handle; if (handles[n_handles] == INVALID_HANDLE_VALUE) { /* socket */ if (SAFE_FD_ISSET(i, rfds)) { @@ -246,8 +248,9 @@ 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]); - if (PeekNamedPipe((HANDLE)_get_osfhandle(handle_slot_to_fd[i]), NULL, 0, NULL, &dwBytes, NULL)) + if (PeekNamedPipe((HANDLE)handle, NULL, 0, NULL, &dwBytes, NULL)) { /* check to see if gdb pipe has data available */ if (dwBytes)