From fe1be78e384c11f7f15a712f116cdeb9e914957b Mon Sep 17 00:00:00 2001
From: Miller Puckette <millerpuckette@users.sourceforge.net>
Date: Thu, 7 Dec 2006 16:19:05 +0000
Subject: More 64 bit fixes, notably confusion about file extensions and taking
 garray_getfloatarray out of expr

svn path=/trunk/; revision=6685
---
 pd/src/d_array.c | 37 +++++++++++--------------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

(limited to 'pd/src/d_array.c')

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
 {
-- 
cgit v1.2.1