From 039d8816d4f4f292e93c7608582a5660cdc7b635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Thu, 19 Apr 2007 07:16:51 +0000 Subject: uppercased __win32__ to __WIN32__ which should make it compile on mingw32 svn path=/trunk/externals/iem16/; revision=7581 --- src/iem16_table.h | 97 ++++++++++++++++++++++++------------------------------- 1 file changed, 42 insertions(+), 55 deletions(-) (limited to 'src') diff --git a/src/iem16_table.h b/src/iem16_table.h index 3ba50f3..d03ed9b 100644 --- a/src/iem16_table.h +++ b/src/iem16_table.h @@ -37,62 +37,49 @@ EXTERN void table16_usedindsp(t_table16*x); should have been by CPU type and not by operating system! */ #ifdef __irix__ /* big-endian. Most significant byte is at low address in memory */ -#define HIOFFSET 0 /* word offset to find MSB */ -#define LOWOFFSET 1 /* word offset to find LSB */ -#define int32 long /* a data type that has 32 bits */ -#else -#ifdef __win32__ +# define HIOFFSET 0 /* word offset to find MSB */ +# define LOWOFFSET 1 /* word offset to find LSB */ +# define int32 long /* a data type that has 32 bits */ +#elif defined __WIN32__ /* little-endian; most significant byte is at highest address */ -#define HIOFFSET 1 -#define LOWOFFSET 0 -#define int32 long -#else -#ifdef __FreeBSD__ -#include -#if BYTE_ORDER == LITTLE_ENDIAN -#define HIOFFSET 1 -#define LOWOFFSET 0 -#else -#define HIOFFSET 0 /* word offset to find MSB */ -#define LOWOFFSET 1 /* word offset to find LSB */ -#endif /* BYTE_ORDER */ -#include -#define int32 int32_t -#endif -#ifdef __linux__ - -#include - -#if !defined(__BYTE_ORDER) || !defined(__LITTLE_ENDIAN) -#error No byte order defined -#endif - -#if __BYTE_ORDER == __LITTLE_ENDIAN -#define HIOFFSET 1 -#define LOWOFFSET 0 -#else -#define HIOFFSET 0 /* word offset to find MSB */ -#define LOWOFFSET 1 /* word offset to find LSB */ -#endif /* __BYTE_ORDER */ - -#include -#define int32 int32_t - -#else -#ifdef __APPLE__ -#ifdef __BIG_ENDIAN__ -#define HIOFFSET 0 /* word offset to find MSB */ -#define LOWOFFSET 1 /* word offset to find LSB */ -#else -#define HIOFFSET 1 -#define LOWOFFSET 0 -#endif -#define int32 int /* a data type that has 32 bits */ - -#endif /* __APPLE__ */ -#endif /* __linux__ */ -#endif /* MSW */ -#endif /* SGI */ +# define HIOFFSET 1 +# define LOWOFFSET 0 +# define int32 long +#elif defined __FreeBSD__ +# include +# if BYTE_ORDER == LITTLE_ENDIAN +# define HIOFFSET 1 +# define LOWOFFSET 0 +# else +# define HIOFFSET 0 /* word offset to find MSB */ +# define LOWOFFSET 1 /* word offset to find LSB */ +# endif /* BYTE_ORDER */ +# include +# define int32 int32_t +#elif defined __linux__ +# include +# if !defined(__BYTE_ORDER) || !defined(__LITTLE_ENDIAN) +# error No byte order defined +# endif +# if __BYTE_ORDER == __LITTLE_ENDIAN +# define HIOFFSET 1 +# define LOWOFFSET 0 +# else +# define HIOFFSET 0 /* word offset to find MSB */ +# define LOWOFFSET 1 /* word offset to find LSB */ +# endif /* __BYTE_ORDER */ +# include +# define int32 int32_t +#elif defined __APPLE__ +# ifdef __BIG_ENDIAN__ +# define HIOFFSET 0 /* word offset to find MSB */ +# define LOWOFFSET 1 /* word offset to find LSB */ +# else +# define HIOFFSET 1 +# define LOWOFFSET 0 +# endif +# define int32 int /* a data type that has 32 bits */ +#endif /* system */ union tabfudge { -- cgit v1.2.1