From 655e4f88a6b7fd82a570a17cf1219356f4587a37 Mon Sep 17 00:00:00 2001
From: ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Sun, 6 Jul 2008 23:22:17 +0000
Subject: - fixed build issues with win32 - fixed build warnings for last
 commit - set svn props for last commit

git-svn-id: svn://svn.berlios.de/openocd/trunk@760 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
 src/jim.c | 36 ++++++++++--------------------------
 1 file changed, 10 insertions(+), 26 deletions(-)

(limited to 'src/jim.c')

diff --git a/src/jim.c b/src/jim.c
index 4cf4f3de..e9eb5882 100644
--- a/src/jim.c
+++ b/src/jim.c
@@ -38,6 +38,8 @@
 #include <errno.h>
 #include <time.h>
 
+#include "replacements.h"
+
 /* Include the platform dependent libraries for
  * dynamic loading of libraries. */
 #ifdef JIM_DYNLIB
@@ -45,7 +47,9 @@
 #ifndef WIN32
 #define WIN32 1
 #endif
+#ifndef STRICT
 #define STRICT
+#endif
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #if _MSC_VER >= 1000
@@ -12027,8 +12031,7 @@ out:
  * Jim's idea of STDIO..
  * ---------------------------------------------------------------------------*/
 
-int
-Jim_fprintf( Jim_Interp *interp, void *cookie, const char *fmt, ... )
+int Jim_fprintf( Jim_Interp *interp, void *cookie, const char *fmt, ... )
 {
 	int r;
 
@@ -12038,10 +12041,8 @@ Jim_fprintf( Jim_Interp *interp, void *cookie, const char *fmt, ... )
 	va_end(ap);
 	return r;
 }
-	
 
-int 
-Jim_vfprintf( Jim_Interp *interp, void *cookie, const char *fmt, va_list ap )
+int Jim_vfprintf( Jim_Interp *interp, void *cookie, const char *fmt, va_list ap )
 {
 	if( (interp == NULL) || (interp->cb_vfprintf == NULL) ){
 		errno = ENOTSUP;
@@ -12050,8 +12051,7 @@ Jim_vfprintf( Jim_Interp *interp, void *cookie, const char *fmt, va_list ap )
 	return (*(interp->cb_vfprintf))( cookie, fmt, ap );
 }
 
-size_t
-Jim_fwrite( Jim_Interp *interp, const void *ptr, size_t size, size_t n, void *cookie )
+size_t Jim_fwrite( Jim_Interp *interp, const void *ptr, size_t size, size_t n, void *cookie )
 {
 	if( (interp == NULL) || (interp->cb_fwrite == NULL) ){
 		errno = ENOTSUP;
@@ -12060,8 +12060,7 @@ Jim_fwrite( Jim_Interp *interp, const void *ptr, size_t size, size_t n, void *co
 	return (*(interp->cb_fwrite))( ptr, size, n, cookie);
 }
 
-size_t
-Jim_fread( Jim_Interp *interp, void *ptr, size_t size, size_t n, void *cookie )
+size_t Jim_fread( Jim_Interp *interp, void *ptr, size_t size, size_t n, void *cookie )
 {
 	if( (interp == NULL) || (interp->cb_fread == NULL) ){
 		errno = ENOTSUP;
@@ -12070,8 +12069,7 @@ Jim_fread( Jim_Interp *interp, void *ptr, size_t size, size_t n, void *cookie )
 	return (*(interp->cb_fread))( ptr, size, n, cookie);
 }
 
-int
-Jim_fflush( Jim_Interp *interp, void *cookie )
+int Jim_fflush( Jim_Interp *interp, void *cookie )
 {
 	if( (interp == NULL) || (interp->cb_fflush == NULL) ){
 		/* pretend all is well */
@@ -12080,8 +12078,7 @@ Jim_fflush( Jim_Interp *interp, void *cookie )
 	return (*(interp->cb_fflush))( cookie );
 }
 
-char *  
-Jim_fgets( Jim_Interp *interp, char *s, int size, void *cookie )
+char* Jim_fgets( Jim_Interp *interp, char *s, int size, void *cookie )
 {
 	if( (interp == NULL) || (interp->cb_fgets == NULL) ){
 		errno = ENOTSUP;
@@ -12089,16 +12086,3 @@ Jim_fgets( Jim_Interp *interp, char *s, int size, void *cookie )
 	}
 	return (*(interp->cb_fgets))( s, size, cookie );
 }
-
-	
-
-
-
-
-/*
- * Local Variables: **
- * tab-width: 4 **
- * c-basic-offset: 4 **
- * End: **
- */
-
-- 
cgit v1.2.3