From 7cd0515ffb4f0fbaae1f034237feacfc5ee71299 Mon Sep 17 00:00:00 2001
From: Christian Stimming <stimming@tuhh.de>
Date: Sun, 7 Mar 2010 13:06:03 +0000
Subject: [PATCH] MSVC compatiblity: snprintf is required to have a prefixing
 underscore.

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

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18864 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 packaging/win32/install.sh                 | 5 +++--
 src/business/business-core/business-core.i | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh
index 1704d795c9..d705014226 100644
--- a/packaging/win32/install.sh
+++ b/packaging/win32/install.sh
@@ -397,8 +397,8 @@ EOF
         ${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 @@ EOF
 #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
diff --git a/src/business/business-core/business-core.i b/src/business/business-core/business-core.i
index 9ce0116057..01d1f9cd20 100644
--- a/src/business/business-core/business-core.i
+++ b/src/business/business-core/business-core.i
@@ -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"