diff options
| author | Miller Puckette <millerpuckette@users.sourceforge.net> | 2005-07-29 19:01:22 +0000 |
|---|---|---|
| committer | Miller Puckette <millerpuckette@users.sourceforge.net> | 2005-07-29 19:01:22 +0000 |
| commit | 18c47474a668d7bbbabd525686355c16a45f6ec4 (patch) | |
| tree | 034625615da54aafc44661aabfcaf8f82578f007 /pd/src/d_osc.c | |
| parent | 819bc4309313e32809dff7cfd99df930c5055082 (diff) | |
Mac to work with tcl/tk 8.4.5; pd extension added automatically in saveas
bug fix writing aiff gfiles
bug fix (tcl error messages when starting open dialogs)
svn path=/trunk/; revision=3385
Diffstat (limited to 'pd/src/d_osc.c')
| -rw-r--r-- | pd/src/d_osc.c | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/pd/src/d_osc.c b/pd/src/d_osc.c index 37821564..0d485513 100644 --- a/pd/src/d_osc.c +++ b/pd/src/d_osc.c @@ -17,33 +17,33 @@ #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(MACOSX) #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 MACOSX +#define __BYTE_ORDER BYTE_ORDER +#define __LITTLE_ENDIAN LITTLE_ENDIAN +#endif + +#ifdef __linux__ #include <endian.h> +#endif +#if defined(__unix__) || defined(MACOSX) #if !defined(__BYTE_ORDER) || !defined(__LITTLE_ENDIAN) #error No byte order defined #endif - + #if __BYTE_ORDER == __LITTLE_ENDIAN #define HIOFFSET 1 #define LOWOFFSET 0 @@ -51,20 +51,10 @@ #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 /* __unix__ or MACOSX*/ -#else -#ifdef MACOSX -#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 /* MACOSX */ -#endif /* __linux__ */ -#endif /* MSW */ -#endif /* SGI */ union tabfudge { |