diff options
| author | Miller Puckette <millerpuckette@users.sourceforge.net> | 2006-12-07 16:19:05 +0000 |
|---|---|---|
| committer | Miller Puckette <millerpuckette@users.sourceforge.net> | 2006-12-07 16:19:05 +0000 |
| commit | fe1be78e384c11f7f15a712f116cdeb9e914957b (patch) | |
| tree | f3573f404f09e47cb13008c48abbc7775b90cf4b /pd/src/d_array.c | |
| parent | e40e15b5844bc49174d4798d710e264b97cdeaf4 (diff) | |
More 64 bit fixes, notably confusion about file extensions and taking
garray_getfloatarray out of expr
svn path=/trunk/; revision=6685
Diffstat (limited to 'pd/src/d_array.c')
| -rw-r--r-- | pd/src/d_array.c | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/pd/src/d_array.c b/pd/src/d_array.c index de72ef12..e8c034fe 100644 --- a/pd/src/d_array.c +++ b/pd/src/d_array.c @@ -503,32 +503,28 @@ static void tabread4_tilde_setup(void) #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 +#endif /* IRIX */ + #ifdef MSW /* little-endian; most significant byte is at highest address */ #define HIOFFSET 1 #define LOWOFFSET 0 #define int32 long -#else -#ifdef __FreeBSD__ +#endif + +#if defined(__FreeBSD__) || defined(__APPLE__) #include <machine/endian.h> -#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 <sys/types.h> -#define int32 int32_t #endif -#ifdef __linux__ +#ifdef __linux__ #include <endian.h> +#endif + +#if defined(__unix__) || defined(__APPLE__) #if !defined(__BYTE_ORDER) || !defined(__LITTLE_ENDIAN) #error No byte order defined #endif - + #if __BYTE_ORDER == __LITTLE_ENDIAN #define HIOFFSET 1 #define LOWOFFSET 0 @@ -536,20 +532,9 @@ static void tabread4_tilde_setup(void) #define HIOFFSET 0 /* word offset to find MSB */ #define LOWOFFSET 1 /* word offset to find LSB */ #endif /* __BYTE_ORDER */ - #include <sys/types.h> #define int32 int32_t - -#else -#ifdef __APPLE__ -#define HIOFFSET 0 /* word offset to find MSB */ -#define LOWOFFSET 1 /* word offset to find LSB */ -#define int32 int /* a data type that has 32 bits */ - -#endif /* __APPLE__ */ -#endif /* __linux__ */ -#endif /* MSW */ -#endif /* SGI */ +#endif /* __unix__ or __APPLE__*/ union tabfudge { |