* configure.in, {bcc32,win32,wince}/Makefile.sub (HAVE_SNPRINTF,

  HAVE_VSNPRINTF): use win32/win32.c's implementation instead of
  missing/vsnprintf.c's.

* win32/win32.[ch] (rb_w32_snprintf, rb_w32_vsnprintf): reverted.


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

3 files changed, 27 insertions, 0 deletions

diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 385ac01522..89ec5cad37 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -248,6 +248,8 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub
 #define HAVE_STRTOL 1
 #define HAVE_STRTOUL 1
 #define HAVE_FLOCK 1
+#define HAVE_SNPRINTF 1
+#define HAVE_VSNPRINTF 1
 #define HAVE_ISNAN 1
 #define HAVE_FINITE 1
 #define HAVE_HYPOT 1
diff --git a/win32/win32.c b/win32/win32.c
index 02fbbdeb70..7345f3d2df 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -3600,6 +3600,26 @@ rb_w32_utime(const char *path, 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;
diff --git a/win32/win32.h b/win32/win32.h
index bb3acd7961..a347f04f7a 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -178,6 +178,11 @@ extern int    rb_w32_rename(const char *, const char *);
 extern char **rb_w32_get_environ(void);
 extern void   rb_w32_free_environ(char **);
 
+#define vsnprintf(s,n,f,l) rb_w32_vsnprintf(s,n,f,l)
+#define snprintf   rb_w32_snprintf
+extern int rb_w32_vsnprintf(char *, size_t, const char *, va_list);
+extern int rb_w32_snprintf(char *, size_t, const char *, ...);
+
 extern int chown(const char *, int, int);
 extern int link(const char *, const char *);
 extern int gettimeofday(struct timeval *, struct timezone *);