diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-19 10:32:19 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-19 10:32:19 +0400 |
| commit | 425a81a29b8adf1fc2d913dfc679d6ca62cd05fa (patch) | |
| tree | 47f6c0b42f0c0f87495f4843d57ad874b5587d63 /source/blender/imbuf/intern/imbuf.h | |
| parent | 049838fe0ce1b2e737c7d2c539cb8a945d52b902 (diff) | |
remove WITH_* defines from image formats, instead just dont build the files at all.
Diffstat (limited to 'source/blender/imbuf/intern/imbuf.h')
| -rw-r--r-- | source/blender/imbuf/intern/imbuf.h | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/source/blender/imbuf/intern/imbuf.h b/source/blender/imbuf/intern/imbuf.h index cd7d385ed92..88be4ffbb5f 100644 --- a/source/blender/imbuf/intern/imbuf.h +++ b/source/blender/imbuf/intern/imbuf.h @@ -44,7 +44,7 @@ #include <stdio.h> #ifndef WIN32 -#include <unistd.h> +# include <unistd.h> #endif #include <fcntl.h> @@ -53,11 +53,8 @@ #include <math.h> #ifndef WIN32 -#include <sys/mman.h> -#endif - -#if !defined(WIN32) -#define O_BINARY 0 +# include <sys/mman.h> +# define O_BINARY 0 #endif #define SWAP_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & 0xff)) @@ -66,15 +63,15 @@ #define ENDIAN_NOP(x) (x) #if defined(__sgi) || defined(__sparc) || defined(__sparc__) || defined (__PPC__) || defined (__hppa__) || (defined (__APPLE__) && !defined(__LITTLE_ENDIAN__)) -#define LITTLE_SHORT SWAP_SHORT -#define LITTLE_LONG SWAP_LONG -#define BIG_SHORT ENDIAN_NOP -#define BIG_LONG ENDIAN_NOP +# define LITTLE_SHORT SWAP_SHORT +# define LITTLE_LONG SWAP_LONG +# define BIG_SHORT ENDIAN_NOP +# define BIG_LONG ENDIAN_NOP #else -#define LITTLE_SHORT ENDIAN_NOP -#define LITTLE_LONG ENDIAN_NOP -#define BIG_SHORT SWAP_SHORT -#define BIG_LONG SWAP_LONG +# define LITTLE_SHORT ENDIAN_NOP +# define LITTLE_LONG ENDIAN_NOP +# define BIG_SHORT SWAP_SHORT +# define BIG_LONG SWAP_LONG #endif typedef unsigned char uchar; |