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/blenlib/intern/storage.c | |
| 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/blenlib/intern/storage.c')
| -rw-r--r-- | source/blender/blenlib/intern/storage.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index b0c0f106f06..9bcbdcce12e 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -68,20 +68,17 @@ #include <fcntl.h> #include <string.h> /* strcpy etc.. */ -#ifndef WIN32 -#include <sys/ioctl.h> -#include <unistd.h> /* */ -#include <pwd.h> -#endif - #ifdef WIN32 -#include <io.h> -#include <direct.h> -#include "BLI_winstuff.h" -#include "utfconv.h" +# include <io.h> +# include <direct.h> +# include "BLI_winstuff.h" +# include "utfconv.h" +#else +# include <sys/ioctl.h> +# include <unistd.h> +# include <pwd.h> #endif - /* lib includes */ #include "MEM_guardedalloc.h" |