cygwin fixes

git-svn-id: svn://svn.berlios.de/openocd/trunk@1266 b42882b7-edfa-0310-969c-e2dbd0fdcd60
15 years ago · ee94947ffe
--- 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)
--- 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!!!! */
 }