kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/zlib/zlib.c: remove hacky macro introduced at r30437.

Browse source 
* 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
This commit is contained in:
naruse 2016-05-21 17:47:52 +00:00
parent 8becb1e465
commit fd307c3b60
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Sun May 22 02:41:52 2016 NARUSE, Yui <naruse@ruby-lang.org>
* 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.
Sat May 21 21:07:18 2016 NARUSE, Yui <naruse@ruby-lang.org>
* configure.in (ALWAYS_INLINE): force compilers the function inlined.

6
ext/zlib/zlib.c
View file

@ -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;
}