merges r20909 and r20910 from trunk into ruby_1_9_1.

* configure.in (mingw): no longer uses snprintf and vsnprintf of
  msvcrt.

* win32/win32.c (rb_w32_vsnprintf, rb_w32_snprintf): removed.

* win32/Makefile.sub (config.h): vsnprintf exists in VC7 or later.

* win32/mkexports.rb (Exports#initialize): aliases
  rb_w32_vsnprintf and rb_w32_snprintf for binary compatibility.

* sprintf.c (rb_str_format): uses snprintf instead of sprintf.

* numeric.c (flo_to_s, rb_num2long, rb_num2ll): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20998 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 4 insertions, 20 deletions

diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 862230785d..eece6f9148 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -423,7 +423,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
 #define HAVE_STRTOUL 1
 #define HAVE_FLOCK 1
 #define HAVE_SNPRINTF 1
+!if $(MSC_VER) >= 1300
 #define HAVE_VSNPRINTF 1
+!endif
 #define HAVE_ISNAN 1
 #define HAVE_FINITE 1
 #define HAVE_HYPOT 1
diff --git a/win32/mkexports.rb b/win32/mkexports.rb
index 2ed251ec1c..adf0c5e336 100755
--- a/win32/mkexports.rb
+++ b/win32/mkexports.rb
@@ -51,6 +51,8 @@ class Exports
       end
     end
     syms["NtInitialize"] ||= "ruby_sysinit" if syms["ruby_sysinit"]
+    syms["rb_w32_vsnprintf"] ||= "vsnprintf"
+    syms["rb_w32_snprintf"] ||= "snprintf"
     @syms = syms
   end
 
diff --git a/win32/win32.c b/win32/win32.c
index 6cffc21ade..9697c8ec60 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -4553,26 +4553,6 @@ rb_w32_utime(const char *path, const struct utimbuf *times)
 }
 
 int
-rb_w32_vsnprintf(char *buf, size_t size, const char *format, va_list va)
-{
-    int ret = _vsnprintf(buf, size, format, va);
-    if (size > 0) buf[size - 1] = 0;
-    return ret;
-}
-
-int
-rb_w32_snprintf(char *buf, size_t size, const char *format, ...)
-{
-    int ret;
-    va_list va;
-
-    va_start(va, format);
-    ret = vsnprintf(buf, size, format, va);
-    va_end(va);
-    return ret;
-}
-
-int
 rb_w32_mkdir(const char *path, int mode)
 {
     int ret = -1;