diff options
| author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-12-22 10:28:11 +0000 |
|---|---|---|
| committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-12-22 10:28:11 +0000 |
| commit | ee94947ffec3038696a4c604edd9f9c323e993e3 (patch) | |
| tree | 7f2b98d1600a8647780e918d4b7f226bd2cc4560 | |
| parent | 99fe9c819cb7b78ec325be82d955371ca8fb5e70 (diff) | |
| download | openocd+libswd-ee94947ffec3038696a4c604edd9f9c323e993e3.tar.gz openocd+libswd-ee94947ffec3038696a4c604edd9f9c323e993e3.tar.bz2 openocd+libswd-ee94947ffec3038696a4c604edd9f9c323e993e3.tar.xz openocd+libswd-ee94947ffec3038696a4c604edd9f9c323e993e3.zip | |
cygwin fixes
git-svn-id: svn://svn.berlios.de/openocd/trunk@1266 b42882b7-edfa-0310-969c-e2dbd0fdcd60
| -rw-r--r-- | src/helper/ioutil.c | 9 | ||||
| -rw-r--r-- | 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 80e43d4e..4711e341 100644 --- a/src/helper/ioutil.c +++ b/src/helper/ioutil.c @@ -62,8 +62,9 @@ #include <stdio.h> #include <string.h> - +#if !defined(__CYGWIN__) #include <ifaddrs.h> +#endif #include <unistd.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, 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 f36cf437..96e33824 100644 --- a/src/server/httpd.c +++ b/src/server/httpd.c @@ -54,7 +54,7 @@ #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_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!!!! */ } |