merges r21136 from trunk into ruby_1_9_1.

* win32/Makefile.sub (config.h): do not use snprintf/vsnprintf in msvcrt. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
ruby · Dec 29, 2008 · 91cf769 · 91cf769
1 parent 6494fb4
commit 91cf769
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Dec 28 19:11:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (config.h): do not use snprintf/vsnprintf in
+	  msvcrt.
+
+	* sprintf.c: not force to override snprintf/vsnprintf.
+	  [ruby-core:20824]
+
 Sun Dec 28 17:10:13 2008  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
 
 	* ext/dl/test/test_dl2.rb: modify strncpy, strcpy, qsort, types.

diff --git a/win32/Makefile.sub b/win32/Makefile.sub
@@ -422,10 +422,6 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
 #define HAVE_STRTOL 1
 #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