[openocd-svn] Main OpenOCD repository branch, master, updated. 0.2.0-382-gc7941f3

[David B. <dbr...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  c7941f3aa02cc53e741b0a42531098aded64a5db (commit)
      from  d0e1b14ef6a4465eaad750d2d4def1ad8e76f6fc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c7941f3aa02cc53e741b0a42531098aded64a5db
Author: Redirect 'Slash' NIL <red...@gm...>
Date:   Sat Oct 17 22:18:38 2009 -0700

    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.

diff --git a/src/helper/replacements.c b/src/helper/replacements.c
index 77e4ee7..ef20e77 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))
 							{

-----------------------------------------------------------------------

Summary of changes:
 src/helper/replacements.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository