Work around swprintf being wrong in FB's stdio.bi, which would have broke heaps of functions (and caused compile warnings)

Author: rversteegen

crt_extra/stdio.bi

@@ -28,4 +28,17 @@ extern "C"
 
 #endif
 
+'msvcrt has swprintf/vswprintf functions which differ from POSIX, and FB's
+'stdio.bi header is based on mingw/msvcrt. IMO FB ought to try to hide these
+'sorts of platform deficiencies to make it easier to write cross-platform code.
+#undef swprintf
+#undef vswprintf
+#ifdef __FB_WIN32__
+	declare function swprintf alias "snwprintf" (byval s as wchar_t ptr, byval n as size_t, byval format as wchar_t ptr, ...) as long
+	declare function vswprintf  alias "vsnwprintf" (byval s as wchar_t ptr, byval n as size_t, byval format as wchar_t ptr, byval arg as va_list) as long
+#else
+	declare function swprintf (byval s as wchar_t ptr, byval n as size_t, byval format as wchar_t ptr, ...) as long
+	declare function vswprintf (byval s as wchar_t ptr, byval n as size_t, byval format as wchar_t ptr, byval arg as va_list) as long
+#endif
+
 end extern

dev_file_eoc.bas

@@ -1,7 +1,6 @@
 /' detects EOF for file device '/
 
 #include "fb.bi"
-#include "crt_extra/stdio.bi"
 
 extern "C"
 function fb_DevFileEof( handle as FB_FILE ptr ) as long
@@ -45,4 +44,4 @@ function fb_DevFileEof( handle as FB_FILE ptr ) as long
 	FB_UNLOCK()
 	return iif(eof__ <> 0, FB_TRUE, FB_FALSE)
 end function
-end extern
+end extern

dev_file_seek.bas

@@ -1,7 +1,6 @@
 /' file device '/
 
 #include "fb.bi"
-#include "crt_extra/stdio.bi"
 
 extern "C"
 function fb_DevFileSeek( handle as FB_FILE ptr, offset as fb_off_t, whence as long ) as long
@@ -23,4 +22,4 @@ function fb_DevFileSeek( handle as FB_FILE ptr, offset as fb_off_t, whence as lo
 
 	return res
 end function
-end extern
+end extern

dev_file_size.bas

@@ -1,7 +1,6 @@
 /' file device size calc '/
 
 #include "fb.bi"
-#include "crt_extra/stdio.bi"
 
 extern "C"
 function fb_hDevFileSeekStart( fp as FILE ptr, mode as long, encod as FB_FILE_ENCOD, seek_zero as long ) as long
@@ -51,4 +50,4 @@ function fb_DevFileGetSize( fp as FILE ptr, mode as long, encod as FB_FILE_ENCOD
 
 	return size
 end function
-end extern
+end extern

dev_file_tell.bas

@@ -1,7 +1,6 @@
 /' file device '/
 
 #include "fb.bi"
-#include "crt_extra/stdio.bi"
 
 extern "C"
 function fb_DevFileTell( handle as FB_FILE ptr, pOffset as fb_off_t ptr ) as long
@@ -22,4 +21,4 @@ function fb_DevFileTell( handle as FB_FILE ptr, pOffset as fb_off_t ptr ) as lon
 
 	return fb_ErrorSetNum( FB_RTERROR_OK )
 end function
-end extern
+end extern

fb.bi

@@ -11,6 +11,7 @@
 	/' FB's CRT headers need some work. Any additions to them that aren't
 	   yet merged into FB are in these extra headers '/
 	#include "crt_extra/string.bi"
+	#include "crt_extra/stdio.bi"
 
 	#define FB_TRUE (-1)
 	#define FB_FALSE 0