diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-11-29 21:12:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-11-29 21:12:33 +0300 |
| commit | 46c80d5d1122c4917565f8cc1c2b7fe2d0481bd8 (patch) | |
| tree | 8285a3ea87de3d9baf578541f852dafa38bd26d2 /source/blender/blenloader/intern | |
| parent | 1cb59394ae69148904de34a32d09319f02c86a09 (diff) | |
Correct includes for win32
Diffstat (limited to 'source/blender/blenloader/intern')
4 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index a4d2399b9ce..b71a4029690 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -28,6 +28,7 @@ #ifndef WIN32 # include <unistd.h> /* for read close */ #else +# include <zlib.h> /* odd include order-issue */ # include <io.h> // for open close read # include "winsock2.h" # include "BLI_winstuff.h" diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c index 7c6b6ec7249..7e5127aa407 100644 --- a/source/blender/blenloader/intern/versioning_260.c +++ b/source/blender/blenloader/intern/versioning_260.c @@ -25,8 +25,6 @@ * \ingroup blenloader */ -#include "zlib.h" - #include "BLI_utildefines.h" /* allow readfile to use deprecated functionality */ diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c index c6db6c4476c..1a1bc3a55be 100644 --- a/source/blender/blenloader/intern/versioning_legacy.c +++ b/source/blender/blenloader/intern/versioning_legacy.c @@ -35,6 +35,7 @@ #ifndef WIN32 # include <unistd.h> // for read close #else +# include <zlib.h> /* odd include order-issue */ # include <io.h> // for open close read # include "winsock2.h" # include "BLI_winstuff.h" diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index c6c10c48b40..bad84949cab 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -80,6 +80,7 @@ #include <stdlib.h> #ifdef WIN32 +# include <zlib.h> /* odd include order-issue */ # include "winsock2.h" # include <io.h> # include "BLI_winstuff.h" |