Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17881/src
Modified Files: Tag: devel_0_39 s_inter.c s_loader.c m_fifo.c Log Message: __APPLE__: allow to load embedded standalone wish.app, some preprocessing fixes
Index: s_loader.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_loader.c,v retrieving revision 1.4.4.5.2.9 retrieving revision 1.4.4.5.2.10 diff -C2 -d -r1.4.4.5.2.9 -r1.4.4.5.2.10 *** s_loader.c 28 Jul 2006 14:23:37 -0000 1.4.4.5.2.9 --- s_loader.c 10 Aug 2006 00:33:09 -0000 1.4.4.5.2.10 *************** *** 5,9 **** #ifdef __APPLE__ #include <AvailabilityMacros.h> ! #if defined(MAC_OS_X_VERSION_10_3) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 #define DL_OPEN #endif --- 5,9 ---- #ifdef __APPLE__ #include <AvailabilityMacros.h> ! #if !defined(DL_OPEN) && defined(MAC_OS_X_VERSION_10_3) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 #define DL_OPEN #endif
Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.5.4.10.2.18 retrieving revision 1.5.4.10.2.19 diff -C2 -d -r1.5.4.10.2.18 -r1.5.4.10.2.19 *** s_inter.c 3 Aug 2006 00:46:48 -0000 1.5.4.10.2.18 --- s_inter.c 10 Aug 2006 00:33:09 -0000 1.5.4.10.2.19 *************** *** 1097,1101 **** char *homedir = getenv("HOME"), filename[250]; struct stat statbuf; ! /* First look for wish (renamed "Pd") in bundled tk.framework */ sprintf(filename, "%s/../Frameworks/Tk.framework/Resources/Pd", guidir); if (stat(filename, &statbuf) >= 0) --- 1097,1113 ---- char *homedir = getenv("HOME"), filename[250]; struct stat statbuf; ! ! /* First look for non-renamed Wish Shells */ ! sprintf(filename, "%s/../Frameworks/Tk.framework/Resources/Wish Shell.app/Contents/MacOS/Wish Shell", guidir); ! if (stat(filename, &statbuf) >= 0) ! goto foundit; ! sprintf(filename, "%s/../MacOS/Wish Shell.app/Contents/MacOS/Wish Shell", guidir); ! if (stat(filename, &statbuf) >= 0) ! goto foundit; ! sprintf(filename, "%s/../MacOS/Wish.app/Contents/MacOS/Wish", guidir); ! if (stat(filename, &statbuf) >= 0) ! goto foundit; ! ! /* Then look for wish (renamed "Pd") in bundled tk.framework */ sprintf(filename, "%s/../Frameworks/Tk.framework/Resources/Pd", guidir); if (stat(filename, &statbuf) >= 0) *************** *** 1108,1111 **** --- 1120,1124 ---- if (stat(filename, &statbuf) >= 0) goto foundit; + if (!homedir || strlen(homedir) > 150) goto nohomedir;
Index: m_fifo.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_fifo.c,v retrieving revision 1.1.2.14.2.4 retrieving revision 1.1.2.14.2.5 diff -C2 -d -r1.1.2.14.2.4 -r1.1.2.14.2.5 *** m_fifo.c 6 Jul 2006 18:03:43 -0000 1.1.2.14.2.4 --- m_fifo.c 10 Aug 2006 00:33:09 -0000 1.1.2.14.2.5 *************** *** 158,162 **** #endif
! #if defined(__GNUC__) && defined(__PPC__)
static void* lifo_pop(t_lifo* lifo) --- 158,162 ---- #endif
! #if defined(__GNUC__) && (defined(__POWERPC__) || defined(__PPC__))
static void* lifo_pop(t_lifo* lifo)