[frontierkernel-commits] Frontier/Common/SystemHeaders standard.h,1.1,1.2

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/SystemHeaders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27279/Frontier/Common/SystemHeaders

Modified Files:
	standard.h 
Log Message:
When building for Carbon, rely on system headers for assert and verify macros.

Index: standard.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/SystemHeaders/standard.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** standard.h	9 Oct 2004 06:17:48 -0000	1.1
--- standard.h	23 Oct 2004 19:23:47 -0000	1.2
***************
*** 292,305 ****
  /*macros*/
  
! #ifdef fldebug
! 
! 	short __assert(char *, char *, short);
! 	#define assert(x)	((void) ((x) ? 0 : __assert(#x, __FILE__, __LINE__)))
! 	#define verify(x)	assert(x)
  #else
! 
! 	#define assert(x)	((void) 0)
! 	#define verify(x)	((void) x)
! 
  #endif
  
--- 292,308 ----
  /*macros*/
  
! #if MACVERSION && TARGET_API_MAC_CARBON
! 	#if TARGET_RT_MAC_CFM	/* 2004-10-23 aradke: rely on Debugging.h */
! 		#define assert(x) check(x)
! 	#endif
  #else
! 	#ifdef fldebug
! 		short __assert(char *, char *, short);
! 		#define assert(x)	((void) ((x) ? 0 : __assert(#x, __FILE__, __LINE__)))
! 		#define verify(x)	assert(x)
! 	#else
! 		#define assert(x)	((void) 0)
! 		#define verify(x)	((void) x)
! 	#endif
  #endif