From c53be4f0d67bb78299865d1f2aac741a3a4959ad Mon Sep 17 00:00:00 2001 From: yugui Date: Tue, 3 Mar 2009 11:39:53 +0000 Subject: merges r22589 from trunk into ruby_1_9_1. -- * missing/vsnprintf.c (BSD_vfprintf): ptrdiff_t may be larger than long. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@22735 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ missing/vsnprintf.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 46cf0655a..a0c76e775 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Feb 24 13:13:49 2009 Nobuyoshi Nakada + + * missing/vsnprintf.c (BSD_vfprintf): ptrdiff_t may be larger than + long. + Tue Feb 24 10:49:37 2009 Nobuyoshi Nakada * process.c (rb_waitpid): last argument was missing. diff --git a/missing/vsnprintf.c b/missing/vsnprintf.c index a19ed5c6c..9d0e62694 100644 --- a/missing/vsnprintf.c +++ b/missing/vsnprintf.c @@ -713,11 +713,16 @@ reswitch: switch (ch) { case 'h': flags |= SHORTINT; goto rflag; +#if SIZEOF_PTRDIFF_T == SIZEOF_LONG case 't': +#endif case 'l': flags |= LONGINT; goto rflag; #ifdef _HAVE_SANE_QUAD_ +#if SIZEOF_PTRDIFF_T == SIZEOF_LONG_LONG + case 't': +#endif case 'q': flags |= QUADINT; goto rflag; -- cgit