[Squeak-Commits] squeak/platforms/Mac OS/vm sqMacMemory.c,1.8,1.9

[John M M. <jo...@us...>]

Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm
In directory usw-pr-cvs1:/tmp/cvs-serv3752/squeak/platforms/Mac OS/vm

Modified Files:
	sqMacMemory.c 
Log Message:
3.2.8b3 fixes for building as a carbon netscape plugin

Index: sqMacMemory.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacMemory.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** sqMacMemory.c	9 May 2002 19:22:53 -0000	1.8
--- sqMacMemory.c	6 Aug 2002 21:45:49 -0000	1.9
***************
*** 12,15 ****
--- 12,16 ----
  *  Feb 22nd, 2002, JMM moved code into 10 other files, see sqMacMain.c for comments
  *  Mar  8th, 2002, JMM Must unmap view first then free.
+ *  3.2.8b1 July 24th, 2002 JMM support for os-x plugin under IE 5.x
  *****************************************************************************/
  
***************
*** 51,54 ****
--- 52,60 ----
  
  	long 	availableMemory;
+ 	
+ #if TARGET_API_MAC_CARBON && defined(__MWERKS__)
+     availableMemory = MaxBlock() - reservedMemory;
+     return availableMemory;
+ #endif 
  
  #if TARGET_API_MAC_CARBON
***************
*** 100,104 ****
  	minHeapSize;
       
! #ifdef PLUGIN
      gMaxHeapSize = gHeapSize = *desiredHeapSize;
      
--- 106,110 ----
  	minHeapSize;
       
! #if defined( PLUGIN)  || (TARGET_API_MAC_CARBON && defined(__MWERKS__))
      gMaxHeapSize = gHeapSize = *desiredHeapSize;
      
***************
*** 112,117 ****
  	      return debug;
      #endif
! #endif
! 
  #if TARGET_API_MAC_CARBON
      gHeapSize = gMaxHeapSize;
--- 118,122 ----
  	      return debug;
      #endif
! #else
  #if TARGET_API_MAC_CARBON
      gHeapSize = gMaxHeapSize;
***************
*** 153,156 ****
--- 158,162 ----
  	return debug;
  #endif 
+ #endif
  }