r18864 - gnucash/trunk - MSVC compatiblity: snprintf is required to have a prefixing underscore.

[Christian Stimming]

Author: cstim
Date: 2010-03-07 08:06:03 -0500 (Sun, 07 Mar 2010)
New Revision: 18864
Trac: http://svn.gnucash.org/trac/changeset/18864

Modified:
   gnucash/trunk/packaging/win32/install.sh
   gnucash/trunk/src/business/business-core/business-core.i
Log:
MSVC compatiblity: snprintf is required to have a prefixing underscore.

Also, more symbols of libguile/gc.h need explicit declspec on MSVC.

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2010-03-07 12:54:33 UTC (rev 18863)
+++ gnucash/trunk/packaging/win32/install.sh	2010-03-07 13:06:03 UTC (rev 18864)
@@ -397,8 +397,8 @@
         ${DLLTOOL} -d $_GUILE_UDIR/lib/libguile.def -D $_GUILE_UDIR/bin/libguile.dll -l $_GUILE_UDIR/lib/libguile.lib
         # Also, for MSVC compiler we need to slightly modify the gc.h header
         GC_H=$_GUILE_UDIR/include/libguile/gc.h
-        grep -v 'extern.*_freelist2;' ${GC_H} > ${GC_H}.tmp
-        mv ${GC_H}.tmp ${GC_H}
+        grep -v 'extern .*_freelist2;' ${GC_H} > ${GC_H}.tmp
+        grep -v 'extern int scm_block_gc;' ${GC_H}.tmp > ${GC_H}
         cat >> ${GC_H} <<EOF
 #ifdef _MSC_VER
 # define LIBGUILEDECL __declspec (dllimport)
@@ -407,6 +407,7 @@
 #endif
 extern LIBGUILEDECL SCM scm_freelist2;
 extern LIBGUILEDECL struct scm_t_freelist scm_master_freelist2;
+extern LIBGUILEDECL int scm_block_gc;
 EOF
         rm -rf ${TMP_UDIR}/guile-*
     fi

Modified: gnucash/trunk/src/business/business-core/business-core.i
===================================================================
--- gnucash/trunk/src/business/business-core/business-core.i	2010-03-07 12:54:33 UTC (rev 18863)
+++ gnucash/trunk/src/business/business-core/business-core.i	2010-03-07 13:06:03 UTC (rev 18864)
@@ -15,6 +15,9 @@
 #include <gncTaxTable.h>
 #include <gncVendor.h>
 #include <gncBusGuile.h>
+#ifdef _MSC_VER
+# define snprintf _snprintf
+#endif
 #include "engine-helpers.h"
 #include "gncBusGuile.h"