Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1591/source

Modified Files: flbase.cpp flmap.h flstdc.h flsupport.cpp Log Message: ""

Index: flbase.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flbase.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** flbase.cpp 21 Jun 2004 13:58:19 -0000 1.17 --- flbase.cpp 11 Aug 2004 04:04:25 -0000 1.18 *************** *** 3,7 **** flext - C++ layer for Max/MSP and pd (pure data) externals

! Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 3,7 ---- flext - C++ layer for Max/MSP and pd (pure data) externals

! Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 136,140 **** #if FLEXT_SYS == FLEXT_SYS_PD // this declaration is missing in m_pd.h (0.37-0 and -1) ! extern "C" void canvas_getargs(int *argcp, t_atom **argvp); #endif

--- 136,145 ---- #if FLEXT_SYS == FLEXT_SYS_PD // this declaration is missing in m_pd.h (0.37-0 and -1) ! // but it is there in 0.37-2 (but how to tell which micro-version?) ! extern "C" ! #ifdef _MSC_VER ! __declspec(dllimport) ! #endif ! void canvas_getargs(int *argcp, t_atom **argvp); #endif

Index: flmap.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flmap.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** flmap.h 10 Aug 2004 03:32:04 -0000 1.2 --- flmap.h 11 Aug 2004 04:04:25 -0000 1.3 *************** *** 49,55 **** #if defined(_MSC_VER) && (_MSC_VER < 0x1300) // with the MSVC6 STL implementation iterators can't be initialized... ! iterator(AnyMap::iterator &it) { static_cast<AnyMap::iterator &>(*this) = it; } #else ! iterator(AnyMap::iterator &it): AnyMap::iterator(it) {} #endif

--- 49,56 ---- #if defined(_MSC_VER) && (_MSC_VER < 0x1300) // with the MSVC6 STL implementation iterators can't be initialized... ! iterator(AnyMap::iterator it) { static_cast<AnyMap::iterator &>(*this) = it; } #else ! // note: &it doesn't work for gcc (i don't know why it doesn't...) ! iterator(AnyMap::iterator it): AnyMap::iterator(it) {} #endif

Index: flsupport.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** flsupport.cpp 23 Apr 2004 02:32:55 -0000 1.37 --- flsupport.cpp 11 Aug 2004 04:04:25 -0000 1.38 *************** *** 162,165 **** --- 162,167 ---- #if FLEXT_SYS == FLEXT_SYS_JMAX blk = (char *)::fts_malloc(bytes); + #elif defined(FLEXT_USECMEM) + blk = (char *)::malloc(bytes); #else blk = (char *)::getbytes(bytes); *************** *** 195,198 **** --- 197,202 ---- #if FLEXT_SYS == FLEXT_SYS_JMAX ::fts_free(ori); + #elif defined(FLEXT_USECMEM) + ::free(ori); #else ::freebytes(ori,bytes); *************** *** 223,226 **** --- 227,232 ---- #if FLEXT_SYS == FLEXT_SYS_JMAX blk = (char *)::fts_malloc(bytes); + #elif defined(FLEXT_USECMEM) + blk = (char *)::malloc(bytes); #else blk = (char *)::getbytes(bytes); *************** *** 257,260 **** --- 263,268 ---- #if FLEXT_SYS == FLEXT_SYS_JMAX ::fts_free(ori); + #elif defined(FLEXT_USECMEM) + ::free(ori); #else ::freebytes(ori,bytes);

Index: flstdc.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flstdc.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** flstdc.h 10 Aug 2004 03:32:04 -0000 1.24 --- flstdc.h 11 Aug 2004 04:04:25 -0000 1.25 *************** *** 127,134 **** typedef t_object *t_thing;

! #if FLEXT_OS == FLEXT_OS_WIN ! typedef void *t_qelem; // qelem not defined in Windows SDK ! #else typedef qelem t_qelem; #endif

--- 127,136 ---- typedef t_object *t_thing;

! // for the following to work for Max for OSX you should have the latest SDK ! #if FLEXT_OS == FLEXT_OS_MAC && !defined(MAC_VERSION) ! // Max for OS9 SDK typedef qelem t_qelem; + #else + typedef void *t_qelem; #endif