diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-08-03 01:05:30 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-08-03 01:05:30 +0000 |
commit | 378258bd0b5c98d9752fc2a3e259d7f5d6d7a653 (patch) | |
tree | a769b39379c9c6c4e29bbf67d776193c3aafa67a | |
parent | 5ddbcc5de450eb457343aab0be101ca0795d18d7 (diff) | |
download | ruby-378258bd0b5c98d9752fc2a3e259d7f5d6d7a653.tar.gz |
* configure.in: check vsnprintf() and snprintf().
* sprintf.c, missing/vsnprintf.c: made vsnprintf() and snprintf()
private. fixed: [ruby-dev:26651]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8895 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 13 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | missing/vsnprintf.c | 4 | ||||
-rw-r--r-- | sprintf.c | 4 |
4 files changed, 19 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Wed Aug 3 10:05:08 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in: check vsnprintf() and snprintf(). + + * sprintf.c, missing/vsnprintf.c: made vsnprintf() and snprintf() + private. fixed: [ruby-dev:26651] + Wed Aug 3 08:22:13 2005 Yukihiro Matsumoto <matz@ruby-lang.org> * ext/socket/socket.c (ruby_connect): revert [ruby-talk:111654] @@ -43,7 +50,7 @@ Mon Aug 1 13:53:55 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> Mon Aug 1 01:08:21 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> * lib/drb/drb.rb (check_insecure_method): use private_methods and - protected_methods instead of respond_to? to check method visibility. + protected_methods instead of respond_to? to check method visibility. [ruby-dev:26616] * test/drb/drbtest.rb: ditto. @@ -52,14 +59,14 @@ Mon Aug 1 01:08:21 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> Sat Jul 30 18:49:44 2005 Masaki Suketa <masaki.suketa@nifty.ne.jp> - * ext/win32ole/win32ole.c: add WIN32OLE_TYPE#ole_typelib, + * ext/win32ole/win32ole.c: add WIN32OLE_TYPE#ole_typelib, WIN32OLE_TYPE#implemented_ole_types. * ext/win32ole/tests/testOLETYPE.rb: ditto. Fri Jul 29 16:12:02 005 Keiju Ishitsuka <keiju@ruby-lang.org> * lib/irb/context.rb: fix `irb --readline` option. [ruby-dev:40955] - + Fri Jul 29 09:59:38 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval.c (rb_call0): fix calling zsuper from a method with anonymous diff --git a/configure.in b/configure.in index 87e453b2e8..1f278a4a03 100644 --- a/configure.in +++ b/configure.in @@ -489,7 +489,7 @@ AC_CHECK_FUNCS(fmod killpg wait4 waitpid fork spawnv syscall chroot fsync getcwd setrgid setegid setregid setresgid issetugid pause lchown lchmod\ getpgrp setpgrp getpgid setpgid initgroups getgroups setgroups\ getpriority getrlimit setrlimit\ - dlopen sigprocmask sigaction _setjmp\ + dlopen sigprocmask sigaction _setjmp vsnprintf snprintf\ setsid telldir seekdir fchmod mktime timegm cosh sinh tanh\ setuid setgid daemon select_large_fdset \ _UNW_createContextForSelf) diff --git a/missing/vsnprintf.c b/missing/vsnprintf.c index 91e7ffb1a4..543f895500 100644 --- a/missing/vsnprintf.c +++ b/missing/vsnprintf.c @@ -1082,6 +1082,7 @@ exponent(p0, exp, fmtch) } #endif /* FLOATING_POINT */ +#ifndef HAVE_VSNPRINTF int vsnprintf(str, n, fmt, ap) char *str; @@ -1102,11 +1103,13 @@ vsnprintf(str, n, fmt, ap) *f._p = 0; return (ret); } +#endif #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)snprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#ifndef HAVE_SNPRINTF int #if defined(HAVE_STDARG_PROTOTYPES) snprintf(char *str, size_t n, char const *fmt, ...) @@ -1138,3 +1141,4 @@ va_dcl va_end(ap); return (ret); } +#endif @@ -847,6 +847,10 @@ fmt_setup(buf, c, flags, width, prec) # define u_quad_t unsigned LONG_LONG # endif #endif +#undef vsnprintf +#undef snprintf +#define vsnprintf ruby_vsnprintf +#define snprintf ruby_snprintf #include "missing/vsnprintf.c" static int |