Correct signatures for FinalizerPtrs

Author: amesgen

Codec/Compression/Zlib/Stream.hsc

@@ -1098,7 +1098,7 @@ c_deflateInit2 z a b c d e =
 foreign import ccall SAFTY "zlib.h inflate"
   c_inflate :: StreamState -> CInt -> IO CInt
 
-foreign import ccall unsafe "zlib.h &inflateEnd"
+foreign import ccall unsafe "hs-zlib.h &_hs_zlib_inflateEnd"
   c_inflateEnd :: FinalizerPtr StreamState
 
 foreign import ccall unsafe "zlib.h inflateReset"
@@ -1119,7 +1119,7 @@ foreign import ccall unsafe "zlib.h inflateSetDictionary"
 foreign import ccall SAFTY "zlib.h deflate"
   c_deflate :: StreamState -> CInt -> IO CInt
 
-foreign import ccall unsafe "zlib.h &deflateEnd"
+foreign import ccall unsafe "hs-zlib.h &_hs_zlib_deflateEnd"
   c_deflateEnd :: FinalizerPtr StreamState
 
 foreign import ccall unsafe "zlib.h zlibVersion"

cbits-extra/hs-zlib.c

@@ -0,0 +1,9 @@
+#include "hs-zlib.h"
+
+void _hs_zlib_inflateEnd(z_streamp strm) {
+  inflateEnd(strm);
+}
+
+void _hs_zlib_deflateEnd(z_streamp strm) {
+  deflateEnd(strm);
+}

cbits-extra/hs-zlib.h

@@ -0,0 +1,8 @@
+#ifndef HS_ZLIB_EXTRAS
+#define HS_ZLIB_EXTRAS
+
+#include "zlib.h"
+
+void _hs_zlib_inflateEnd(z_streamp strm);
+void _hs_zlib_deflateEnd(z_streamp strm);
+#endif

zlib.cabal

@@ -101,7 +101,12 @@ library
   build-tools:     hsc2hs >= 0.67 && < 0.69
     -- GHC 7 ships hsc2hs-0.67
 
-  includes:        zlib.h
+  -- use `includes:` to include them when compiling
+  includes:        zlib.h hs-zlib.h
+  -- use `install-includes:` to make it part of the sdist
+  install-includes: hs-zlib.h
+  include-dirs:    cbits-extra
+  c-sources:       cbits-extra/hs-zlib.c
   ghc-options:     -Wall -fwarn-tabs
   if flag(non-blocking-ffi)
     cpp-options:   -DNON_BLOCKING_FFI