Apply crc_t fixes to zlib extension

We already fixed this issue in the previous FFI version. This is also fixed in MRI trunk, which is where this change is copied from.
ryoqun · Jul 5, 2012 · 290404f · 290404f
1 parent d24264d
commit 290404f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/lib/18/zlib/ext/extconf.rb b/lib/18/zlib/ext/extconf.rb
@@ -56,6 +56,8 @@
 
   $defs.concat(defines.collect{|d|' -D'+d})
 
+  have_type('z_crc_t', 'zlib.h')
+
   create_makefile('zlib')
 
 end
diff --git a/lib/18/zlib/ext/zlib.c b/lib/18/zlib/ext/zlib.c
@@ -342,7 +342,11 @@ static VALUE
 rb_zlib_crc_table(obj)
     VALUE obj;
 {
-    const unsigned long *crctbl;
+#if !defined(HAVE_TYPE_Z_CRC_T)
+    /* z_crc_t is defined since zlib-1.2.7. */
+    typedef unsigned long z_crc_t;
+#endif
+    const z_crc_t *crctbl;
     VALUE dst;
     int i;
 

diff --git a/lib/19/zlib/ext/extconf.rb b/lib/19/zlib/ext/extconf.rb
@@ -58,6 +58,7 @@
 
   have_func('crc32_combine', 'zlib.h')
   have_func('adler32_combine', 'zlib.h')
+  have_type('z_crc_t', 'zlib.h')
 
   create_makefile('zlib')
 

diff --git a/lib/19/zlib/ext/zlib.c b/lib/19/zlib/ext/zlib.c
@@ -464,7 +464,11 @@ rb_zlib_crc32_combine(VALUE klass, VALUE crc1, VALUE crc2, VALUE len2)
 static VALUE
 rb_zlib_crc_table(VALUE obj)
 {
-    const unsigned long *crctbl;
+#if !defined(HAVE_TYPE_Z_CRC_T)
+    /* z_crc_t is defined since zlib-1.2.7. */
+    typedef unsigned long z_crc_t;
+#endif
+    const z_crc_t *crctbl;
     VALUE dst;
     int i;