[Squeak-Commits] squeak/platforms/Cross/vm sq.h,1.7,1.8

[Tim R. <row...@us...>]

Update of /cvsroot/squeak/squeak/platforms/Cross/vm
In directory sc8-pr-cvs1:/tmp/cvs-serv10448

Modified Files:
	sq.h 
Log Message:
move Mac browser macros in front of #includ sqPlatformSpecific.h

Index: sq.h
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Cross/vm/sq.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** sq.h	14 May 2003 02:10:29 -0000	1.7
--- sq.h	20 May 2003 18:56:25 -0000	1.8
***************
*** 9,12 ****
--- 9,14 ----
  *   RCSID:   $Id$
  *
+ *	05/20/03	tim - move browser related macros in front of
+ *			include of sqPlatformSpecific.h
  *	02/26/03	tim change browser plugin support code
  *	01/28/02	Tim add macro default for sqFilenameFromStringOpen
***************
*** 165,168 ****
--- 167,188 ----
  #define sqFTruncate(filenum, fileoffset) true
  
+ /* old browser plug-in support, maintained for a little while */
+ #if 1
+ void plugInForceTimeToReturn(void);
+ int plugInInit(char *imageName);
+ int plugInNotifyUser(char *msg);
+ void plugInSetStartTime(void);
+ int plugInShutdown(void);
+ int plugInTimeToReturn(void);
+ #endif
+ /* macros to support Mac browser plugin needs without ugly
+  * code in Interpreter
+  */
+ #define insufficientMemorySpecifiedError() error("Insufficient memory for this image")
+ #define insufficientMemoryAvailableError() error("Failed to allocate memory for the heap")
+ #define unableToReadImageError() error("Read failed or premature end of image file")
+ #define browserPluginReturnIfNeeded()
+ #define browserPluginInitialiseIfNeeded()
+ 
  /* this include file may redefine earlier definitions and macros: */
  #include "sqPlatformSpecific.h"
***************
*** 341,344 ****
--- 361,366 ----
  int clipboardWriteFromAt(int count, int byteArrayIndex, int startIndex);
  
+ <<<<<<< sq.h
+ =======
  /* old browser plug-in support, maintained for a little while */
  #if 1
***************
*** 359,362 ****
--- 381,385 ----
  #define browserPluginInitialiseIfNeeded()
  
+ >>>>>>> 1.7
  
  /* interpreter entry points needed by compiled primitives */