Merge branch 'dsp5680xx_cherry' of git://repo.or.cz/openocd/dsp568013 into HEAD

[fw/openocd] / src / helper / replacements.c

diff --git a/src/helper/replacements.c b/src/helper/replacements.c
index 9f1312ca92cbda7ffbde69ef358fd8715c987219..ef20e7710660c0f186e64a5032f155e16644aa67 100644 (file)
--- a/src/helper/replacements.c
+++ b/src/helper/replacements.c
@@ -2,7 +2,7 @@
  *   Copyright (C) 2006 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   Copyright (C) 2008 by Spencer Oliver                                  *
@@ -23,18 +23,11 @@
  *   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
  *
  * will alloc memory and clear it
@@ -42,7 +35,7 @@
 void *clear_malloc(size_t size)
 {
        void *t = malloc(size);
-       if (t!=NULL)
+       if (t != NULL)
        {
                memset(t, 0x00, size);
        }
@@ -52,7 +45,7 @@ void *clear_malloc(size_t size)
 void *fill_malloc(size_t size)
 {
        void *t = malloc(size);
-       if (t!=NULL)
+       if (t != NULL)
        {
                /* We want to initialize memory to some known bad state.  */
                /* 0 and 0xff yields 0 and -1 as integers, which often          */
@@ -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,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 */
@@ -206,11 +203,11 @@ int win_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct time
        FD_ZERO(&aread);
        FD_ZERO(&awrite);
        FD_ZERO(&aexcept);
-       
+
        limit = GetTickCount() + ms_total;
        do {
                retcode = 0;
-       
+
                if (sock_max_fd >= 0) {
                        /* overwrite the zero'd sets here; the select call
                         * will clear those that are not active */
@@ -221,7 +218,7 @@ int win_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct time
                        tvslice.tv_sec = 0;
                        tvslice.tv_usec = 100000;
 
-                       retcode = select(sock_max_fd+1, &aread, &awrite, &aexcept, &tvslice);
+                       retcode = select(sock_max_fd + 1, &aread, &awrite, &aexcept, &tvslice);
                }
                if (n_handles > 0) {
                        /* check handles */
@@ -247,8 +244,8 @@ 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))
                                                        {
                                                                /* check to see if gdb pipe has data available */