Eliminate MixedCaps symbol from public JTAG TAP API:

[openocd] / src / helper / replacements.c

diff --git a/src/helper/replacements.c b/src/helper/replacements.c
index 39a736c7c4336e2d26c3684f3c81ad223a058999..6b367fa8437a1bcbc17b67d150df37d56fe6b4a5 100644 (file)
--- a/src/helper/replacements.c
+++ b/src/helper/replacements.c
@@ -23,17 +23,10 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 /* DANGER!!!! These must be defined *BEFORE* replacements.h and the malloc() macro!!!! */
 
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
 /* 
  * clear_malloc
  *
@@ -64,9 +57,13 @@ void *fill_malloc(size_t size)
        return t;
 }
 
-#include "replacements.h"
-
-#include <stdio.h>
+#define IN_REPLACEMENTS_C
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 
 #ifdef _WIN32
 #include <io.h>
@@ -172,7 +169,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 +244,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)