From f34b2bfd74dccd95d03189d3b1f18356cb8ac971 Mon Sep 17 00:00:00 2001 From: naruse Date: Sat, 21 May 2016 17:47:52 +0000 Subject: * ext/zlib/zlib.c: remove hacky macro introduced at r30437. * ext/zlib/zlib.c (gzfile_make_header): cast as long (instead of int). * ext/zlib/zlib.c (gzfile_make_footer): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55105 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/zlib/zlib.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'ext') diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 66e68916a8..7f92eb6d19 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -52,8 +52,6 @@ max_uint(long n) #define MAX_UINT(n) (uInt)(n) #endif -#define sizeof(x) ((int)sizeof(x)) - static ID id_dictionaries; /*--------- Prototypes --------*/ @@ -2523,7 +2521,7 @@ gzfile_make_header(struct gzfile *gz) gzfile_set32((unsigned long)gz->mtime, &buf[4]); buf[8] = extraflags; buf[9] = gz->os_code; - zstream_append_buffer(&gz->z, buf, sizeof(buf)); + zstream_append_buffer(&gz->z, buf, (long)sizeof(buf)); if (!NIL_P(gz->orig_name)) { zstream_append_buffer2(&gz->z, gz->orig_name); @@ -2544,7 +2542,7 @@ gzfile_make_footer(struct gzfile *gz) gzfile_set32(gz->crc, buf); gzfile_set32(gz->z.stream.total_in, &buf[4]); - zstream_append_buffer(&gz->z, buf, sizeof(buf)); + zstream_append_buffer(&gz->z, buf, (long)sizeof(buf)); gz->z.flags |= GZFILE_FLAG_FOOTER_FINISHED; } -- cgit v1.2.3