Merge branch master

2016-03-08 13:59:33 +01:00
parent 2fb3522470 3090721fc6
commit d9ce07f065
16 changed files with 37 additions and 35 deletions
--- a/include/sqconfig.h
+++ b/include/sqconfig.h
@@ -60,10 +60,10 @@ typedef wchar_t SQChar;


 #define scstrcmp    wcscmp
-#ifdef _MSC_VER
+#ifdef _WIN32
 #define scsprintf   _snwprintf
 #else
-#define scsprintf   snwprintf
+#define scsprintf   swprintf
 #endif
 #define scstrlen    wcslen
 #define scstrtod    wcstod