[simspark-cvs] simspark/spark/utility/sfsexp Makefile.am, 1.1, 1.2 io.c, 1.1, 1.2 malloc_util.c, 1.1, 1.2 sexp.c, 1.1, 1.2

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/utility/sfsexp
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7790/spark/utility/sfsexp

Modified Files:
	Makefile.am io.c malloc_util.c sexp.c 
Log Message:
Merged WIN32 branch back to main trunk (access previous version with tag pre_merge_WIN32)

Index: io.c
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/utility/sfsexp/io.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** io.c	19 Dec 2005 19:13:30 -0000	1.1
--- io.c	15 Mar 2007 07:26:30 -0000	1.2
***************
*** 32,36 ****
--- 32,40 ----
  
  #include <fcntl.h>
+ 
+ #ifndef WIN32
  #include <unistd.h>
+ #endif
+ 
  #include <stdio.h>
  #include <stdlib.h>
***************
*** 39,42 ****
--- 43,51 ----
  #include <assert.h>
  
+ #ifdef WIN32
+ #include <io.h>
+ #define read _read
+ #endif
+ 
  /**
   * initialize an io-wrapper

Index: sexp.c
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/utility/sfsexp/sexp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sexp.c	19 Dec 2005 19:13:30 -0000	1.1
--- sexp.c	15 Mar 2007 07:26:30 -0000	1.2
***************
*** 38,41 ****
--- 38,45 ----
  #include "faststack.h"
  
+ #ifdef WIN32
+ #define snprintf _snprintf
+ #endif
+ 
  /**
   * Recursively walk an s-expression and free it.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/utility/sfsexp/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	19 Dec 2005 19:13:30 -0000	1.1
--- Makefile.am	15 Mar 2007 07:26:30 -0000	1.2
***************
*** 16,18 ****
  sexp_ops.h
  
- EXTRA_DIST = README
--- 16,17 ----

Index: malloc_util.c
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/utility/sfsexp/malloc_util.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** malloc_util.c	19 Dec 2005 19:13:30 -0000	1.1
--- malloc_util.c	15 Mar 2007 07:26:30 -0000	1.2
***************
*** 31,35 ****
  static int last_check = 0;
  
! static inline
  void set_alloc(int i, void *addr, size_t bytes, char *file, int lineno) {
      alloc_list[i].addr = addr;
--- 31,38 ----
  static int last_check = 0;
  
! static
! #ifndef _MSC_VER
! inline
! #endif
  void set_alloc(int i, void *addr, size_t bytes, char *file, int lineno) {
      alloc_list[i].addr = addr;