From 91cf7698e11caddab11567ad7bc9a3774941659c Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 29 Dec 2008 07:18:39 +0000 Subject: [PATCH] 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 --- ChangeLog | 8 ++++++++ win32/Makefile.sub | 4 ---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 876b6a269c04d7..f46922d3b1f3ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sun Dec 28 19:11:03 2008 Nobuyoshi Nakada + + * 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) * ext/dl/test/test_dl2.rb: modify strncpy, strcpy, qsort, types. diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 96dbfebc8ef568..a567c7799f2b11 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