diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-15 11:54:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-15 11:54:07 +0400 |
| commit | a73d0d3e72940ecd0e3e60c8e4e858c7e00ff5e2 (patch) | |
| tree | 554c462fa090dad417a0e0371a7647007c33b1ba /source/blender/imbuf | |
| parent | a8077c8222876bdc67cfbc9ae56b04a12c8657e9 (diff) | |
code cleanup: dont include BLI_winstuff.h on non windows systems, also cleanup some defines/includes for windows.
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/thumbs.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c index f5c22b67c1b..5c54fbab0cf 100644 --- a/source/blender/imbuf/intern/thumbs.c +++ b/source/blender/imbuf/intern/thumbs.c @@ -53,17 +53,18 @@ #include <stdio.h> #ifdef WIN32 -#include <windows.h> /* need to include windows.h so _WIN32_IE is defined */ -#ifndef _WIN32_IE -#define _WIN32_IE 0x0400 /* minimal requirements for SHGetSpecialFolderPath on MINGW MSVC has this defined already */ -#endif -#include <shlobj.h> /* for SHGetSpecialFolderPath, has to be done before BLI_winstuff because 'near' is disabled through BLI_windstuff */ -#include <process.h> /* getpid */ -#include <direct.h> /* chdir */ -#include "BLI_winstuff.h" -#include "utfconv.h" +# include <windows.h> /* need to include windows.h so _WIN32_IE is defined */ +# ifndef _WIN32_IE +# define _WIN32_IE 0x0400 /* minimal requirements for SHGetSpecialFolderPath on MINGW MSVC has this defined already */ +# endif +# include <shlobj.h> /* for SHGetSpecialFolderPath, has to be done before BLI_winstuff + * because 'near' is disabled through BLI_windstuff */ +# include <process.h> /* getpid */ +# include <direct.h> /* chdir */ +# include "BLI_winstuff.h" +# include "utfconv.h" #else -#include <unistd.h> +# include <unistd.h> #endif #define URI_MAX FILE_MAX*3 + 8 |