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

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

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

Modified Files:
	sq.h 
Log Message:
move Mac browser macros in front of #includ sqPlatformSpecific.h; fixe conflict indicator crap

Index: sq.h
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Cross/vm/sq.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** sq.h	20 May 2003 18:56:25 -0000	1.8
--- sq.h	20 May 2003 18:57:27 -0000	1.9
***************
*** 361,385 ****
  int clipboardWriteFromAt(int count, int byteArrayIndex, int startIndex);
  
- <<<<<<< sq.h
- =======
- /* old browser plug-in support, maintained for a little while */
- #if 1
- void plugInForceTimeToReturn(void);
- int plugInInit(char *sqImageName);
- 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()
  
- >>>>>>> 1.7
  
  /* interpreter entry points needed by compiled primitives */
--- 361,365 ----