aboutsummaryrefslogtreecommitdiff
path: root/externals/grill/flext/source
diff options
context:
space:
mode:
authorThomas Grill <xovo@users.sourceforge.net>2003-11-12 03:35:26 +0000
committerThomas Grill <xovo@users.sourceforge.net>2003-11-12 03:35:26 +0000
commit7e747f8cd9634260c3bbcce628a481d72e5cab3c (patch)
tree8d75ce32422af11d1517cd4378e196151185fd17 /externals/grill/flext/source
parent1a27ba8f28e0915e6abc102e2634d99d41fd59fb (diff)
""
svn path=/trunk/; revision=1179
Diffstat (limited to 'externals/grill/flext/source')
-rw-r--r--externals/grill/flext/source/flattr_ed.cpp6
-rwxr-xr-xexternals/grill/flext/source/flqueue.cpp2
-rw-r--r--externals/grill/flext/source/flstdc.h9
-rw-r--r--externals/grill/flext/source/flsupport.h9
4 files changed, 14 insertions, 12 deletions
diff --git a/externals/grill/flext/source/flattr_ed.cpp b/externals/grill/flext/source/flattr_ed.cpp
index 26e4a2bf..fb6183ed 100644
--- a/externals/grill/flext/source/flattr_ed.cpp
+++ b/externals/grill/flext/source/flattr_ed.cpp
@@ -465,17 +465,17 @@ void flext_base::cb_GfxSave(t_gobj *c, t_binbuf *b)
int argc = binbuf_getnatom(t->te_binbuf);
t_atom *argv = binbuf_getvec(t->te_binbuf);
- int cnt = CheckAttrib(argc,argv);
+ int i,cnt = CheckAttrib(argc,argv);
// process the creation arguments
- for(int i = 1; i < cnt; ++i) BinbufAdd(b,argv[i]);
+ for(i = 1; i < cnt; ++i) BinbufAdd(b,argv[i]);
// process the attributes
AtomList la;
th->ListAttrib(la);
cnt = la.Count();
- for(int i = 0; i < cnt; ++i) {
+ for(i = 0; i < cnt; ++i) {
const t_symbol *sym = GetSymbol(la[i]);
AtomList lv;
const AtomList *lref = NULL;
diff --git a/externals/grill/flext/source/flqueue.cpp b/externals/grill/flext/source/flqueue.cpp
index ee1da752..2d10aeee 100755
--- a/externals/grill/flext/source/flqueue.cpp
+++ b/externals/grill/flext/source/flqueue.cpp
@@ -19,8 +19,10 @@ WARRANTIES, see the file, "license.txt," in this distribution.
#include "flext.h"
#include "flinternal.h"
+#ifdef FLEXT_THREADS
//! Thread id of message queue thread
flext::thrid_t flext::thrmsgid = 0;
+#endif
class qmsg
{
diff --git a/externals/grill/flext/source/flstdc.h b/externals/grill/flext/source/flstdc.h
index fc51e890..55f0b80a 100644
--- a/externals/grill/flext/source/flstdc.h
+++ b/externals/grill/flext/source/flstdc.h
@@ -97,12 +97,9 @@ typedef t_clock t_qelem;
#define WIN_VERSION 1
#endif
-extern "C"
-{
- #include "ext.h"
- #include "ext_user.h"
- #include "z_dsp.h"
-}
+#include "ext.h"
+#include "ext_user.h"
+#include "z_dsp.h"
#undef WIN_VERSION
diff --git a/externals/grill/flext/source/flsupport.h b/externals/grill/flext/source/flsupport.h
index 5ec2b64a..5e63ded0 100644
--- a/externals/grill/flext/source/flsupport.h
+++ b/externals/grill/flext/source/flsupport.h
@@ -59,14 +59,16 @@ public:
*/
static void *NewLarge(size_t bytes) { return ::operator new(bytes); }
//! Free a large memory block
- static void FreeLarge(void *blk) { return ::operator delete(blk); }
+ static void FreeLarge(void *blk) { ::operator delete(blk); }
//! Get an aligned memory block
static void *NewAligned(size_t bytes,int bitalign = 128);
//! Free an aligned memory block
static void FreeAligned(void *blk);
//! Test for alignment
- static bool IsAligned(void *ptr,int bitalign = 128) { return (reinterpret_cast<unsigned long long>(ptr)&(bitalign-1)) == 0; }
+ static bool IsAligned(void *ptr,int bitalign = 128) {
+ return (reinterpret_cast<unsigned long>(ptr)&(bitalign-1)) == 0;
+ }
//! @} FLEXT_S_MEMORY
@@ -720,7 +722,8 @@ public:
protected:
- static thrid_t thrhelpid,thrmsgid;
+ static thrid_t thrhelpid;
+ static thrid_t thrmsgid;
static bool StartHelper();
static bool StopHelper();
static void ThrHelper(void *);