From ee94947ffec3038696a4c604edd9f9c323e993e3 Mon Sep 17 00:00:00 2001 From: oharboe Date: Mon, 22 Dec 2008 10:28:11 +0000 Subject: [PATCH] cygwin fixes git-svn-id: svn://svn.berlios.de/openocd/trunk@1266 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/helper/ioutil.c | 9 ++++++--- src/server/httpd.c | 8 +++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c index 80e43d4ea..4711e341f 100644 --- a/src/helper/ioutil.c +++ b/src/helper/ioutil.c @@ -62,8 +62,9 @@ #include #include - +#if !defined(__CYGWIN__) #include +#endif #include #include @@ -564,6 +565,7 @@ zylinjtag_Jim_Command_poke(Jim_Interp *interp, static int zylinjtag_Jim_Command_ip(Jim_Interp *interp, int argc, Jim_Obj * const *argv) { +#if !defined(__CYGWIN__) Jim_Obj *tclOutput = Jim_NewStringObj(interp, "", 0); struct ifaddrs *ifa = NULL, *ifp = NULL; @@ -597,13 +599,14 @@ static int zylinjtag_Jim_Command_ip(Jim_Interp *interp, int argc, } freeifaddrs(ifp); - +#else + Jim_Obj *tclOutput = Jim_NewStringObj(interp, "fixme!!!", 0); +#endif Jim_SetResult(interp, tclOutput); return JIM_OK; } - /* not so pretty code to fish out eth0 mac address */ static int zylinjtag_Jim_Command_mac(Jim_Interp *interp, int argc, Jim_Obj * const *argv) diff --git a/src/server/httpd.c b/src/server/httpd.c index f36cf4379..96e338244 100644 --- a/src/server/httpd.c +++ b/src/server/httpd.c @@ -54,7 +54,7 @@ #define PAGE_NOT_FOUND "File not foundFile not found" -static const char *appendf(const *prev, const char *format, ...) +static const char *appendf(const char *prev, const char *format, ...) { va_list ap; va_start(ap, format); @@ -69,7 +69,7 @@ static const char *appendf(const *prev, const char *format, ...) if (prev != NULL) { - free(prev); + free((void *)prev); } 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); // Find length - char *data; + const char *data; int actual; int retcode; @@ -449,9 +449,11 @@ void httpd_stop(void) void openocd_sleep_prelude(void) { + /* FIX!!!! add locking here!!!! */ } void openocd_sleep_postlude(void) { + /* FIX!!!! add locking here!!!! */ }