- move zlib.h around to make windows happy

still having linking issues with zlib, grumble grumble

3 files changed, 9 insertions, 5 deletions

diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c
index 6442a304983..9a4ffca4844 100644
--- a/source/blender/blenlib/intern/fileops.c
+++ b/source/blender/blenlib/intern/fileops.c
@@ -44,8 +44,11 @@
 #include <config.h>
 #endif
 
+#include "zlib.h"
+
 #ifdef WIN32
 #include "BLI_winstuff.h"
+#include <io.h>
 #else
 #include <sys/param.h>
 #endif
@@ -60,7 +63,6 @@
 #include <fcntl.h>
 
 #include "BKE_utildefines.h"
-#include "zlib.h"
 #include <errno.h>
 
 /* implementations: */
@@ -119,6 +121,8 @@ int BLI_gzip(char *from, char *to) {
 	close(file);
 	
 	remove(from);
+
+	return 0;
 }
 
 #ifdef WIN32
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 43c6a284f9f..6bf63c2b2b7 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -39,6 +39,8 @@
 #include <config.h>
 #endif
 
+#include "zlib.h"
+
 #ifdef WIN32
 #include "winsock2.h"
 #include "BLI_winstuff.h"
@@ -141,8 +143,6 @@
 #include "mydevice.h"
 #include "blendef.h"
 
-#include "zlib.h"
-
 #include <errno.h>
 
 /*
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 3ae58e92b03..647e03da23b 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -83,6 +83,8 @@ Important to know is that 'streaming' has been added to files, for Blender Publi
 #include <config.h>
 #endif
 
+#include "zlib.h"
+
 #ifndef WIN32
 #include <unistd.h>
 #else
@@ -167,8 +169,6 @@ Important to know is that 'streaming' has been added to files, for Blender Publi
 #include "readfile.h"
 #include "genfile.h"
 
-#include "zlib.h"
-
 #include <errno.h>
 
 /* ********* my write, buffered writing with minimum 50k chunks ************ */