diff options
-rw-r--r-- | source/blender/blenkernel/intern/autoexec.c | 4 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_250.c | 1 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_260.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_legacy.c | 1 | ||||
-rw-r--r-- | source/blender/blenloader/intern/writefile.c | 1 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_select.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/allocimbuf.c | 1 |
7 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/autoexec.c b/source/blender/blenkernel/intern/autoexec.c index e161db9da4f..d9462cd0262 100644 --- a/source/blender/blenkernel/intern/autoexec.c +++ b/source/blender/blenkernel/intern/autoexec.c @@ -36,6 +36,10 @@ #include "BLI_fnmatch.h" #include "BLI_path_util.h" +#ifdef WIN32 +# include "BLI_string.h" +#endif + #include "BKE_autoexec.h" /* own include */ /** 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" diff --git a/source/blender/gpu/intern/gpu_select.c b/source/blender/gpu/intern/gpu_select.c index 0014468d095..d8e1fab9f80 100644 --- a/source/blender/gpu/intern/gpu_select.c +++ b/source/blender/gpu/intern/gpu_select.c @@ -37,6 +37,8 @@ #include "DNA_userdef_types.h" +#include "BLI_utildefines.h" + /* Ad hoc number of queries to allocate to skip doing many glGenQueries */ #define ALLOC_QUERIES 200 diff --git a/source/blender/imbuf/intern/allocimbuf.c b/source/blender/imbuf/intern/allocimbuf.c index ff9bef74a79..556c4beeae7 100644 --- a/source/blender/imbuf/intern/allocimbuf.c +++ b/source/blender/imbuf/intern/allocimbuf.c @@ -47,6 +47,7 @@ #include "MEM_guardedalloc.h" +#include "BLI_utildefines.h" #include "BLI_threads.h" static SpinLock refcounter_spin; |