diff options
| author | Thomas Grill <xovo@users.sourceforge.net> | 2003-12-12 22:46:40 +0000 |
|---|---|---|
| committer | Thomas Grill <xovo@users.sourceforge.net> | 2003-12-12 22:46:40 +0000 |
| commit | 4ec3dfe8a29e5b3dd0a0dc7afa23b7da90ddb1d5 (patch) | |
| tree | 5caaf1672794d69906dafd5c3bdf054b335fd24f /externals/grill/flext/source | |
| parent | dd500deadc8cc4577a305a9f1fe438786671f9e6 (diff) | |
""
svn path=/trunk/; revision=1218
Diffstat (limited to 'externals/grill/flext/source')
| -rw-r--r-- | externals/grill/flext/source/flatom_pr.cpp | 2 | ||||
| -rw-r--r-- | externals/grill/flext/source/flext.h | 4 | ||||
| -rw-r--r-- | externals/grill/flext/source/flsupport.h | 6 | ||||
| -rw-r--r-- | externals/grill/flext/source/flthr.cpp | 5 |
4 files changed, 14 insertions, 3 deletions
diff --git a/externals/grill/flext/source/flatom_pr.cpp b/externals/grill/flext/source/flatom_pr.cpp index a77374b9..10eaa54b 100644 --- a/externals/grill/flext/source/flatom_pr.cpp +++ b/externals/grill/flext/source/flatom_pr.cpp @@ -49,7 +49,7 @@ bool flext::PrintAtom(const t_atom &a,char *buf,int bufsz) //#pragma message("Not implemented") #endif else { - ERRINTERNAL(); + error("flext: atom type unknown"); ok = false; } return ok; diff --git a/externals/grill/flext/source/flext.h b/externals/grill/flext/source/flext.h index c18fd29c..47f15ec1 100644 --- a/externals/grill/flext/source/flext.h +++ b/externals/grill/flext/source/flext.h @@ -23,10 +23,10 @@ WARRANTIES, see the file, "license.txt," in this distribution. */ //! \brief flext version number -#define FLEXT_VERSION 500 +#define FLEXT_VERSION 405 //! \brief flext version string -#define FLEXT_VERSTR "0.5.0pre" +#define FLEXT_VERSTR "0.4.5" //! @} diff --git a/externals/grill/flext/source/flsupport.h b/externals/grill/flext/source/flsupport.h index 283466ac..c964c66e 100644 --- a/externals/grill/flext/source/flsupport.h +++ b/externals/grill/flext/source/flsupport.h @@ -69,6 +69,10 @@ public: //! @} FLEXT_S_MEMORY }; +// at the moment it's a real problem that global overloading of allocators +// clashes with MFC (e.g. in vst~) +// therefore... try to think over it +#if 0 #if !defined(_MSC_VER) && !defined(__BORLANDC__) #define NEWTHROW throw(std::bad_alloc) @@ -86,6 +90,8 @@ inline void *operator new[](size_t bytes) NEWTHROW { return flext_root::operator inline void operator delete[](void *blk) DELTHROW { flext_root::operator delete[](blk); } #endif +#endif + class FLEXT_SHARE FLEXT_CLASSDEF(flext); typedef class FLEXT_CLASSDEF(flext) flext; diff --git a/externals/grill/flext/source/flthr.cpp b/externals/grill/flext/source/flthr.cpp index 65fd4c3b..082fd161 100644 --- a/externals/grill/flext/source/flthr.cpp +++ b/externals/grill/flext/source/flthr.cpp @@ -27,6 +27,11 @@ WARRANTIES, see the file, "license.txt," in this distribution. #include <sys/timeb.h> #endif +#if FLEXT_THREADS == FLEXT_THR_WIN32 && WINVER < 0x0500 +#error WIN32 threads need Windows SDK version >= 0x500 +#endif + + #include <errno.h> //! Thread id of system thread |