From 31b9986b9e011f392a73af69f236fe58f785a548 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 15 May 2016 13:54:57 +0000 Subject: io.c: use PRI_OFFT_PREFIX for off_t * io.c (do_io_advise): use configured PRI_OFFT_PREFIX instead of PRI_OFF_T_PREFIX to format off_t properly on Cygwin. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55009 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- io.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/io.c b/io.c index ed7d28d9c9..33c2970a46 100644 --- a/io.c +++ b/io.c @@ -60,13 +60,6 @@ #if !HAVE_OFF_T && !defined(off_t) # define off_t long #endif -#if SIZEOF_OFF_T > SIZEOF_LONG && defined(HAVE_LONG_LONG) -# define PRI_OFF_T_PREFIX "ll" -#elif SIZEOF_OFF_T == SIZEOF_LONG -# define PRI_OFF_T_PREFIX "l" -#else -# define PRI_OFF_T_PREFIX "" -#endif #ifdef HAVE_SYS_TIME_H # include @@ -8621,8 +8614,8 @@ do_io_advise(rb_io_t *fptr, VALUE advice, off_t offset, off_t len) /* posix_fadvise(2) doesn't set errno. On success it returns 0; otherwise it returns the error code. */ VALUE message = rb_sprintf("%"PRIsVALUE" " - "(%"PRI_OFF_T_PREFIX"d, " - "%"PRI_OFF_T_PREFIX"d, " + "(%"PRI_OFFT_PREFIX"d, " + "%"PRI_OFFT_PREFIX"d, " "%"PRIsVALUE")", fptr->pathv, offset, len, advice); rb_syserr_fail_str(rv, message); -- cgit v1.2.3