summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-29 07:18:39 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-29 07:18:39 +0000
commit187c6da9b0c3e820c9d16fd2607b8a39ee6b87ee (patch)
treebe48072a9f1610733280b443ba43496c835b1a31
parent8a2de5218a503198e4ba58d3547ca1ab0adf206c (diff)
merges r21136 from trunk into ruby_1_9_1.
* win32/Makefile.sub (config.h): do not use snprintf/vsnprintf in msvcrt. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--win32/Makefile.sub4
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 876b6a269..f46922d3b 100644
--- 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
index 96dbfebc8..a567c7799 100644
--- 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