2 files changed, 9 insertions, 3 deletions
diff --git a/navit/gui/internal/gui_internal.c b/navit/gui/internal/gui_internal.c
index 5ff4fbeb..9fd0986b 100644
--- a/navit/gui/internal/gui_internal.c
+++ b/navit/gui/internal/gui_internal.c
@@ -39,8 +39,6 @@
 #endif
 #ifndef _MSC_VER
 #include <sys/time.h>
-#else
-#define snprintf sprintf_s
 #endif /* _MSC_VER */
 #include "item.h"
 #include "file.h"
diff --git a/navit/intl_cmake/vasnprintf.c b/navit/intl_cmake/vasnprintf.c
index 8a62282d..e6e29cd6 100644
--- a/navit/intl_cmake/vasnprintf.c
+++ b/navit/intl_cmake/vasnprintf.c
@@ -111,7 +111,15 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
 {
   DIRECTIVES d;
   arguments a;
-
+#ifdef _MSC_VER
+  static int notFirstTime=0;
+  if(!notFirstTime) 
+    {
+      _set_printf_count_output( 1 );
+      notFirstTime = 1;
+    }
+#endif
+        
   if (PRINTF_PARSE (format, &d, &a) < 0)
     {
       errno = EINVAL;