squeak-commits

[Brenda L. <asp...@us...>]

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

Modified Files:
	sq.h 
Log Message:
Merge of ian-branch into the mainline

Index: sq.h
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Cross/vm/sq.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sq.h	7 May 2003 23:49:50 -0000	1.6
--- sq.h	14 May 2003 02:10:29 -0000	1.7
***************
*** 178,182 ****
  int interpret(void);
  int primitiveFail(void);
! int signalSemaphoreWithIndex(int index);
  int success(int);
  
--- 178,182 ----
  int interpret(void);
  int primitiveFail(void);
! int signalSemaphoreWithIndex(int semaIndex);
  int success(int);
  
***************
*** 344,348 ****
  #if 1
  void plugInForceTimeToReturn(void);
! int plugInInit(char *imageName);
  int plugInNotifyUser(char *msg);
  void plugInSetStartTime(void);
--- 344,348 ----
  #if 1
  void plugInForceTimeToReturn(void);
! int plugInInit(char *sqImageName);
  int plugInNotifyUser(char *msg);
  void plugInSetStartTime(void);