diff options
| author | Thomas Grill <xovo@users.sourceforge.net> | 2007-02-22 00:15:15 +0000 |
|---|---|---|
| committer | Thomas Grill <xovo@users.sourceforge.net> | 2007-02-22 00:15:15 +0000 |
| commit | 2d5dcb761ca0fda72dc58669f758d90223611f3a (patch) | |
| tree | b072421c62a2619e99dc48223027fbb58e4d9fa4 /externals/grill/flext/source/flprefix.h | |
| parent | f2e17ed64238724f2bb4638b9e5f5c67ac71aea5 (diff) | |
PD: possibility to create DSP objects without main DSP inlet (use FLEXT_DSP0_NEW or similar)
switching OSX builds to -bundle to avoid symbol clashes for different flext versions
small fix for branch hints
svn path=/trunk/; revision=7441
Diffstat (limited to 'externals/grill/flext/source/flprefix.h')
| -rwxr-xr-x | externals/grill/flext/source/flprefix.h | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/externals/grill/flext/source/flprefix.h b/externals/grill/flext/source/flprefix.h index 490899de..094dacf7 100755 --- a/externals/grill/flext/source/flprefix.h +++ b/externals/grill/flext/source/flprefix.h @@ -407,18 +407,26 @@ WARRANTIES, see the file, "license.txt," in this distribution. // std namespace #ifdef __MWERKS__ -#define STD std +# define STD std #else -#define STD +# define STD #endif // branching hints #ifdef __GNUC__ -#define LIKELY(expression) (__builtin_expect(!!(expression), 1)) -#define UNLIKELY(expression) (__builtin_expect(!!(expression), 0)) +# ifndef LIKELY +# define LIKELY(expression) (__builtin_expect(!!(expression), 1)) +# endif +# ifndef UNLIKELY +# define UNLIKELY(expression) (__builtin_expect(!!(expression), 0)) +# endif #else -#define LIKELY(expression) (expression) -#define UNLIKELY(expression) (expression) +# ifndef LIKELY +# define LIKELY(expression) (expression) +# endif +# ifndef UNLIKELY +# define UNLIKELY(expression) (expression) +# endif #endif |