[PD-cvs] externals/grill/flext/source flsupport.cpp,1.27,1.28 flsupport.h,1.62,1.63

[xovo at projects.sourceforge.net]

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

Modified Files:
	flsupport.cpp flsupport.h 
Log Message:
 ""

Index: flsupport.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** flsupport.cpp	27 Dec 2003 03:32:55 -0000	1.27
--- flsupport.cpp	29 Jan 2004 03:32:03 -0000	1.28
***************
*** 137,145 ****
  
      char *blk;
      if(bytes >= LARGEALLOC) {
          // use C library function for large memory blocks
          blk = (char *)::operator new(bytes);
      }
!     else {
  	//! \todo We need system locking here for secondary threads!
  
--- 137,148 ----
  
      char *blk;
+ #ifdef FLEXT_NOGLOBALNEW
      if(bytes >= LARGEALLOC) {
          // use C library function for large memory blocks
          blk = (char *)::operator new(bytes);
      }
!     else 
! #endif
!     {
  	//! \todo We need system locking here for secondary threads!
  
***************
*** 160,168 ****
  	size_t bytes = *(size_t *)ori;
  
      if(bytes >= LARGEALLOC) {
          // use C library function for large memory blocks
          ::operator delete(ori);
      }
!     else {
  	//! \todo We need system locking here for secondary threads!
  
--- 163,174 ----
  	size_t bytes = *(size_t *)ori;
  
+ #ifdef FLEXT_NOGLOBALNEW
      if(bytes >= LARGEALLOC) {
          // use C library function for large memory blocks
          ::operator delete(ori);
      }
!     else 
! #endif
!     {
  	//! \todo We need system locking here for secondary threads!
  
***************
*** 182,190 ****
  
      char *blk;
      if(bytes >= LARGEALLOC) {
          // use C library function for large memory blocks
          blk = (char *)::operator new(bytes);
      }
!     else {
  	//! \todo We need system locking here for secondary threads!
  
--- 188,199 ----
  
      char *blk;
+ #ifdef FLEXT_NOGLOBALNEW
      if(bytes >= LARGEALLOC) {
          // use C library function for large memory blocks
          blk = (char *)::operator new(bytes);
      }
!     else 
! #endif
!     {
  	//! \todo We need system locking here for secondary threads!
  
***************
*** 207,215 ****
  	size_t bytes = *(size_t *)((char *)blk-sizeof(size_t));
  
      if(bytes >= LARGEALLOC) {
          // use C library function for large memory blocks
          ::operator delete(ori);
      }
!     else {
  	//! \todo We need system locking here for secondary threads!
  
--- 216,227 ----
  	size_t bytes = *(size_t *)((char *)blk-sizeof(size_t));
  
+ #ifdef FLEXT_NOGLOBALNEW
      if(bytes >= LARGEALLOC) {
          // use C library function for large memory blocks
          ::operator delete(ori);
      }
!     else 
! #endif
!     {
  	//! \todo We need system locking here for secondary threads!
  

Index: flsupport.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** flsupport.h	23 Jan 2004 03:42:23 -0000	1.62
--- flsupport.h	29 Jan 2004 03:32:03 -0000	1.63
***************
*** 70,74 ****
  };
  
! 
  /************************************************************************/
  // MFC doesn't like global overloading of allocators
--- 70,74 ----
  };
  
! #ifndef FLEXT_NOGLOBALNEW
  /************************************************************************/
  // MFC doesn't like global overloading of allocators
***************
*** 91,94 ****
--- 91,96 ----
  #endif
  
+ #endif // FLEXT_NOGLOBALNEW
+ 
  /************************************************************************/