From fe1be78e384c11f7f15a712f116cdeb9e914957b Mon Sep 17 00:00:00 2001 From: Miller Puckette 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/configure.in | 3 ++- pd/src/d_array.c | 37 +++++++++++-------------------------- pd/src/d_osc.c | 7 ------- pd/src/notes.txt | 7 +------ pd/src/s_loader.c | 8 ++++---- pd/src/x_list.c | 2 +- 6 files changed, 19 insertions(+), 45 deletions(-) (limited to 'pd/src') diff --git a/pd/src/configure.in b/pd/src/configure.in index a1ceb48e..a94c70eb 100644 --- a/pd/src/configure.in +++ b/pd/src/configure.in @@ -254,7 +254,8 @@ then MORECFLAGS="-DMACOSX3 -DPA_BIG_ENDIAN -Wno-error" EXTERNTARGET=d_ppc else - MORECFLAGS="-arch i386 -arch ppc -Wno-error" + MORECFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk \ + -arch i386 -arch ppc -Wno-error" EXTERNTARGET=d_fat LDFLAGS=$LDFLAGS" -arch i386 -arch ppc" fi 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 -#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__ +#ifdef __linux__ #include +#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 #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 { diff --git a/pd/src/d_osc.c b/pd/src/d_osc.c index 58533165..0f2eb3e9 100644 --- a/pd/src/d_osc.c +++ b/pd/src/d_osc.c @@ -30,11 +30,6 @@ #include #endif -#ifdef __APPLE__ -#define __BYTE_ORDER BYTE_ORDER -#define __LITTLE_ENDIAN LITTLE_ENDIAN -#endif - #ifdef __linux__ #include #endif @@ -55,14 +50,12 @@ #define int32 int32_t #endif /* __unix__ or __APPLE__*/ - union tabfudge { double tf_d; int32 tf_i[2]; }; - /* -------------------------- phasor~ ------------------------------ */ static t_class *phasor_class, *scalarphasor_class; diff --git a/pd/src/notes.txt b/pd/src/notes.txt index 93c9986b..1aa5f8c5 100644 --- a/pd/src/notes.txt +++ b/pd/src/notes.txt @@ -1,14 +1,8 @@ ---------------- dolist -------------------- 0.40-1: - http "about" broken on MSW? help browser broke on Panurge binbuf_read_via_canvas in x_qlist.c -check bug reports on sourceforge -double-click fix on mac? -http://sourceforge.net/tracker/index.php? -func=detail&aid=1564617&group_id=55736&atid=478072 - PC device counting problem (first device invoked by -audiodev 0) test: @@ -52,6 +46,7 @@ detect adc~ and dac~ reblocking more demonstration patches: vibrato using variable delay +real-time spectrum grapher features: sigmund~: sort by pitch; one-shot diff --git a/pd/src/s_loader.c b/pd/src/s_loader.c index a10ebab6..d2022146 100644 --- a/pd/src/s_loader.c +++ b/pd/src/s_loader.c @@ -35,7 +35,7 @@ a fat binary or an indication of the instruction set. */ static char sys_dllextent[] = ".b_i386", sys_dllextent2[] = ".pd_freebsd"; #endif #ifdef __linux__ -#ifdef __ia64__ +#ifdef __x86_64__ static char sys_dllextent[] = ".l_ia64", sys_dllextent2[] = ".pd_linux"; #else static char sys_dllextent[] = ".l_i386", sys_dllextent2[] = ".pd_linux"; @@ -94,9 +94,9 @@ static int sys_do_load_lib(t_canvas *canvas, char *objectname) if (classname = strrchr(objectname, '/')) classname++; else classname = objectname; - if (sys_onloadlist(classname)) + if (sys_onloadlist(objectname)) { - post("%s: already loaded", classname); + post("%s: already loaded", objectname); return (1); } for (i = 0, nameptr = classname; i < MAXPDSTRING-7 && *nameptr; nameptr++) @@ -194,7 +194,7 @@ gotone: } (*makeout)(); class_set_extern_dir(&s_); - sys_putonloadlist(classname); + sys_putonloadlist(objectname); return (1); } diff --git a/pd/src/x_list.c b/pd/src/x_list.c index be37a375..23989585 100644 --- a/pd/src/x_list.c +++ b/pd/src/x_list.c @@ -410,7 +410,7 @@ static void list_length_list(t_list_length *x, t_symbol *s, static void list_length_anything(t_list_length *x, t_symbol *s, int argc, t_atom *argv) { - outlet_float(x->x_obj.ob_outlet, (float)argc); + outlet_float(x->x_obj.ob_outlet, (float)argc+1); } static void list_length_setup(void) -- cgit v1.2.1