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/blenloader/intern | |
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/blenloader/intern')
-rw-r--r-- | source/blender/blenloader/intern/readblenentry.c | 4 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 8 | ||||
-rw-r--r-- | source/blender/blenloader/intern/runtime.c | 6 | ||||
-rw-r--r-- | source/blender/blenloader/intern/writefile.c | 10 |
4 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c index ccf0c226570..49990a953f6 100644 --- a/source/blender/blenloader/intern/readblenentry.c +++ b/source/blender/blenloader/intern/readblenentry.c @@ -64,8 +64,8 @@ #include "BLO_sys_types.h" // needed for intptr_t -#ifdef _WIN32 -#include "BLI_winstuff.h" +#ifdef WIN32 +# include "BLI_winstuff.h" #endif /* local prototypes --------------------- */ diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index e9a5dada044..55f0ccebf95 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -42,11 +42,11 @@ #include <stdarg.h> /* for va_start/end */ #ifndef WIN32 - #include <unistd.h> // for read close +# include <unistd.h> // for read close #else - #include <io.h> // for open close read -#include "winsock2.h" -#include "BLI_winstuff.h" +# include <io.h> // for open close read +# include "winsock2.h" +# include "BLI_winstuff.h" #endif /* allow readfile to use deprecated functionality */ diff --git a/source/blender/blenloader/intern/runtime.c b/source/blender/blenloader/intern/runtime.c index 814061b7318..2f86c810da0 100644 --- a/source/blender/blenloader/intern/runtime.c +++ b/source/blender/blenloader/intern/runtime.c @@ -39,10 +39,10 @@ #include <errno.h> #ifdef WIN32 -#include <io.h> // read, open -#include "BLI_winstuff.h" +# include <io.h> // read, open +# include "BLI_winstuff.h" #else // ! WIN32 -#include <unistd.h> // read +# include <unistd.h> // read #endif #include "BLO_readfile.h" diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 7f2bb72bf49..dc5546d38dd 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -81,12 +81,12 @@ Any case: direct data is ALWAYS after the lib block #include "zlib.h" #ifndef WIN32 -#include <unistd.h> +# include <unistd.h> #else -#include "winsock2.h" -#include <io.h> -#include <process.h> // for getpid -#include "BLI_winstuff.h" +# include "winsock2.h" +# include <io.h> +# include <process.h> // for getpid +# include "BLI_winstuff.h" #endif /* allow writefile to use deprecated functionality (for forward compatibility code) */ |