[frontierkernel-commits] Frontier/Common/source assert.c,1.2,1.3

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

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

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

Index: assert.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/assert.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** assert.c	17 Oct 2004 12:07:51 -0000	1.2
--- assert.c	23 Oct 2004 19:31:59 -0000	1.3
***************
*** 43,49 ****
  #endif
  
- 	short __assert (char *expr, char *file, short line) {
  
! #ifdef TARGET_API_MAC_CARBON
  	
  		/*
--- 43,50 ----
  #endif
  
  
! #if 0 //TARGET_API_MAC_CARBON	/* 2004-10-23 aradke: rely on Debugging.h instead */
! 
! 	short __assert (char *expr, char *file, short line) {
  	
  		/*
***************
*** 155,160 ****
  		flnorentry = false;
  
! #else
  		
  		bigstring bsfile, bsline, bsmessage;
  		static boolean flnorentry = false;
--- 156,168 ----
  		flnorentry = false;
  
! 		return (0);
! 	} /*__assert*/
! 
! #endif	/*TARGET_API_MAC_CARBON*/
! 
! #if TARGET_API_MAC_OS8
  		
+ 	short __assert (char *expr, char *file, short line) {
+ 
  		bigstring bsfile, bsline, bsmessage;
  		static boolean flnorentry = false;
***************
*** 180,187 ****
  		flnorentry = false;
  
- #endif
  		return (0);
  	} /*__assert*/
  
  #endif	/* MACVERSION */
  	
--- 188,196 ----
  		flnorentry = false;
  
  		return (0);
  	} /*__assert*/
  
+ #endif	/*TARGET_API_MAC_OS8*/
+ 
  #endif	/* MACVERSION */
  	
***************
*** 195,199 ****
  
  		#include <assert.h>
- 		#include <crtdbg.h>
  		#include "threads.h"
  
--- 204,207 ----
***************
*** 226,232 ****
  	#ifdef __MWERKS__		/* 2002-11-09 AR: put up MessageBox with Cancel button to abort application */
  
- 		#undef abs
- 		#include <stdlib.h>
- 
  		short __assert (char *expr, char *file, short line) {
  		
--- 234,237 ----