summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-15 13:54:57 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-15 13:54:57 +0000
commit7803106c1bdaf8c067d29fced64bee0e3e15a435 (patch)
tree93c401c5a3c9608071c2afcc204f9450450c374f
parente143a741913fd970e27eb83e3d809d9694038f9f (diff)
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
-rw-r--r--io.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/io.c b/io.c
index ed7d28d9c93..33c2970a460 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 <sys/time.h>
@@ -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);