- fix win32 build

git-svn-id: svn://svn.berlios.de/openocd/trunk@1555 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
ntfreak 2009-04-28 13:40:06 +00:00
parent c5ad875a79
commit 154d8241c9
1 changed files with 4 additions and 2 deletions

View File

@ -172,7 +172,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 */ /* build an array of handles for non-sockets */
for (i = 0; i < max_fd; i++) { for (i = 0; i < max_fd; i++) {
if (SAFE_FD_ISSET(i, rfds) || SAFE_FD_ISSET(i, wfds) || SAFE_FD_ISSET(i, efds)) { 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) { if (handles[n_handles] == INVALID_HANDLE_VALUE) {
/* socket */ /* socket */
if (SAFE_FD_ISSET(i, rfds)) { if (SAFE_FD_ISSET(i, rfds)) {
@ -246,8 +247,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 (WAIT_OBJECT_0 == WaitForSingleObject(handles[i], 0)) {
if (SAFE_FD_ISSET(handle_slot_to_fd[i], rfds)) { if (SAFE_FD_ISSET(handle_slot_to_fd[i], rfds)) {
DWORD dwBytes; 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 */ /* check to see if gdb pipe has data available */
if (dwBytes) if (dwBytes)