Merge branch 'develop'

4kills · Jul 2, 2020 · f39b33b · f39b33b
2 parents 7c8edf0 + 5bf48b2
commit f39b33b
Show file tree

Hide file tree

Showing 30 changed files with 3 additions and 13,455 deletions.
diff --git a/native/compressor.go b/native/compressor.go
@@ -4,7 +4,7 @@ package native
 #cgo CFLAGS: -I/zlib/
 #cgo LDFLAGS: ${SRCDIR}/libs/libz.a
 
-#include "zlib/zlib.h"
+#include "zlib.h"
 
 // I have no idea why I have to wrap just this function but otherwise cgo won't compile
 int defInit2(z_stream* s, int lvl, int method, int windowBits, int memLevel, int strategy) {

diff --git a/native/decompressor.go b/native/decompressor.go
@@ -4,7 +4,7 @@ package native
 #cgo CFLAGS: -I/zlib/
 #cgo LDFLAGS: ${SRCDIR}/libs/libz.a
 
-#include "zlib/zlib.h"
+#include "zlib.h"
 
 // I have no idea why I have to wrap just this function but otherwise cgo won't compile
 int infInit(z_stream* s) {

diff --git a/native/processor.go b/native/processor.go
@@ -4,7 +4,7 @@ package native
 #cgo CFLAGS: -I/zlib/
 #cgo LDFLAGS: ${SRCDIR}/libs/libz.a
 
-#include "zlib/zlib.h"
+#include "zlib.h"
 #include <stdlib.h>
 #include <stdint.h>
 

diff --git a/native/zlib/adler32.c b/native/zlib/adler32.c
diff --git a/native/zlib/compress.c b/native/zlib/compress.c