remove dependency to SIZEOF_INT

3 files changed, 8 insertions, 8 deletions

diff --git a/src/numeric.c b/src/numeric.c
index ef4588f76..b03e57ce6 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -985,7 +985,7 @@ mrb_num2fix(mrb_state *mrb, mrb_value val)
 
     v = mrb_num2long(mrb, val);
     if (!FIXABLE(v))
-        mrb_raise(mrb, E_RANGE_ERROR, "integer %"PRIdVALUE " out of range of fixnum", v);
+        mrb_raise(mrb, E_RANGE_ERROR, "integer %ld out of range of fixnum", v);
     return mrb_fixnum_value(v);
 }
 
diff --git a/src/string.c b/src/string.c
index 9556f93e8..6b8861ace 100644
--- a/src/string.c
+++ b/src/string.c
@@ -4833,9 +4833,9 @@ mrb_str_buf_cat_escaped_char(mrb_state *mrb, mrb_value result, unsigned int c, i
   char buf[CHAR_ESC_LEN + 1];
   int l;
 
-#if SIZEOF_INT > 4
-  c &= 0xffffffff;
-#endif
+  if (sizeof(c) > 4) {
+    c &= 0xffffffff;
+  }
   if (unicode_p) {
     if (c < 0x7F && ISPRINT(c)) {
         snprintf(buf, CHAR_ESC_LEN, "%c", c);
diff --git a/src/transcode.c b/src/transcode.c
index 05d2b05b1..66a4d4e42 100644
--- a/src/transcode.c
+++ b/src/transcode.c
@@ -1770,9 +1770,9 @@ mrb_econv_putbackable(mrb_econv_t *ec)
 {
     if (ec->num_trans == 0)
         return 0;
-#if SIZEOF_SIZE_T > SIZEOF_INT
-    if (ec->elems[0].tc->readagain_len > INT_MAX) return INT_MAX;
-#endif
+    if (sizeof(size_t) > sizeof(int)) {
+      if (ec->elems[0].tc->readagain_len > INT_MAX) return INT_MAX;
+    }
     return (int)ec->elems[0].tc->readagain_len;
 }
 
@@ -2625,7 +2625,7 @@ str_transcode0(mrb_state *mrb, int argc, mrb_value *argv, mrb_value *self, int e
 
     transcode_loop(mrb, &fromp, &bp, (sp+slen), (bp+blen), dest, str_transcoding_resize, sname, dname, ecflags, ecopts);
     if (fromp != sp+slen) {
-        mrb_raise(mrb, E_ARGUMENT_ERROR, "not fully converted, %"PRIdPTRDIFF" bytes left", sp+slen-fromp);
+        mrb_raise(mrb, E_ARGUMENT_ERROR, "not fully converted, %td bytes left", sp+slen-fromp);
     }
     buf = (unsigned char *)RSTRING_PTR(dest);
     *bp = '\0';