root/openocd
2
0
Fork 0
mirror of git://git.code.sf.net/p/openocd/code synced 2025-07-19 08:31:15 +10:00
Code Issues Releases Wiki Activity

cygwin fixes

Browse Source 
git-svn-id: svn://svn.berlios.de/openocd/trunk@1266 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe 2008-12-22 10:28:11 +00:00
parent 99fe9c819c
commit ee94947ffe
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/helper/ioutil.c
View File

@ -62,8 +62,9 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#if !defined(__CYGWIN__)
#include <ifaddrs.h> #include <ifaddrs.h>
#endif
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
@ -564,6 +565,7 @@ zylinjtag_Jim_Command_poke(Jim_Interp *interp,
static int zylinjtag_Jim_Command_ip(Jim_Interp *interp, int argc, static int zylinjtag_Jim_Command_ip(Jim_Interp *interp, int argc,
Jim_Obj * const *argv) Jim_Obj * const *argv)
{ {
#if !defined(__CYGWIN__)
Jim_Obj *tclOutput = Jim_NewStringObj(interp, "", 0); Jim_Obj *tclOutput = Jim_NewStringObj(interp, "", 0);
struct ifaddrs *ifa = NULL, *ifp = NULL; struct ifaddrs *ifa = NULL, *ifp = NULL;
@ -597,13 +599,14 @@ static int zylinjtag_Jim_Command_ip(Jim_Interp *interp, int argc,
} }
freeifaddrs(ifp); freeifaddrs(ifp);
#else
Jim_Obj *tclOutput = Jim_NewStringObj(interp, "fixme!!!", 0);
#endif
Jim_SetResult(interp, tclOutput); Jim_SetResult(interp, tclOutput);
return JIM_OK; return JIM_OK;
} }
/* not so pretty code to fish out eth0 mac address */ /* not so pretty code to fish out eth0 mac address */
static int zylinjtag_Jim_Command_mac(Jim_Interp *interp, int argc, static int zylinjtag_Jim_Command_mac(Jim_Interp *interp, int argc,
Jim_Obj * const *argv) Jim_Obj * const *argv)

8
src/server/httpd.c
View File

@ -54,7 +54,7 @@
#define PAGE_NOT_FOUND "<html><head><title>File not found</title></head><body>File not found</body></html>" #define PAGE_NOT_FOUND "<html><head><title>File not found</title></head><body>File not found</body></html>"
static const char *appendf(const *prev, const char *format, ...) static const char *appendf(const char *prev, const char *format, ...)
{ {
va_list ap; va_list ap;
va_start(ap, format); va_start(ap, format);
@ -69,7 +69,7 @@ static const char *appendf(const *prev, const char *format, ...)
if (prev != NULL) if (prev != NULL)
{ {
free(prev); free((void *)prev);
} }
if (string == NULL) if (string == NULL)
@ -120,7 +120,7 @@ static int httpd_Jim_Command_writeform(Jim_Interp *interp, int argc,
char *file = (char*) Jim_GetString(argv[2], NULL); char *file = (char*) Jim_GetString(argv[2], NULL);
// Find length // Find length
char *data; const char *data;
int actual; int actual;
int retcode; int retcode;
@ -449,9 +449,11 @@ void httpd_stop(void)
void openocd_sleep_prelude(void) void openocd_sleep_prelude(void)
{ {
/* FIX!!!! add locking here!!!! */
} }
void openocd_sleep_postlude(void) void openocd_sleep_postlude(void)
{ {
/* FIX!!!! add locking here!!!! */
} }