[PD-cvs] externals/grill/flext/source flstdc.h,1.39,1.40
Thomas Grill
xovo at users.sourceforge.net
Fri Aug 11 18:44:50 CEST 2006
Update of /cvsroot/pure-data/externals/grill/flext/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2314/source
Modified Files:
flstdc.h
Log Message:
fix dynamic linker problem, not using flat_namespace
OSX switch to dynamic_lookup, 10.3 only but much cleaner
cosmetic changes to calm the compiler
use normal assertion
Index: flstdc.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/flstdc.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** flstdc.h 20 Jun 2006 00:04:11 -0000 1.39
--- flstdc.h 11 Aug 2006 16:44:48 -0000 1.40
***************
*** 29,32 ****
--- 29,34 ----
#ifdef _MSC_VER
#include <crtdbg.h>
+ #else
+ #include <assert.h>
#endif
***************
*** 256,260 ****
#define FLEXT_ERROR(str) _CrtDbgReport(_CRT_ERROR,__FILE__,__LINE__,"flext",NULL)
#else
! #define FLEXT_ASSERT(b) do { if(!(b)) error("Assertion failed: " #b " - in " __FILE__ " line %i",(int)__LINE__); } while(false)
#define FLEXT_WARN(str) error("Warning: in " __FILE__ " line %i",(int)__LINE__)
#define FLEXT_ERROR(str) error("Error: in " __FILE__ " line %i",(int)__LINE__)
--- 258,263 ----
#define FLEXT_ERROR(str) _CrtDbgReport(_CRT_ERROR,__FILE__,__LINE__,"flext",NULL)
#else
! #define FLEXT_ASSERT(b) assert(b)
! //#define FLEXT_ASSERT(b) do { if(!(b)) error("Assertion failed: " #b " - in " __FILE__ " line %i",(int)__LINE__); } while(false)
#define FLEXT_WARN(str) error("Warning: in " __FILE__ " line %i",(int)__LINE__)
#define FLEXT_ERROR(str) error("Error: in " __FILE__ " line %i",(int)__LINE__)
More information about the Pd-cvs
mailing list