[Squeak-Commits] squeak/platforms/Mac OS/vm sqMacMain.c,1.13,1.14

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

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

Modified Files:
	sqMacMain.c 
Log Message:
3.5.1b1 Changed plugin def to browserplugin to avoid confusion. 

Index: sqMacMain.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacMain.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** sqMacMain.c	5 Mar 2003 19:52:18 -0000	1.13
--- sqMacMain.c	19 May 2003 07:19:54 -0000	1.14
***************
*** 14,20 ****
  *  Mar  17th, 2002, JMM look into sleep wakeup issues under os-9 on some computers.
  *  Apr  17th, 2002, JMM Use accessors for VM variables, add os-9 check, plus changes by Alain Fischer <ala...@bl...> to look for image and fetch VM version under os-x
  ****************************************************************************/
  
! //#define PLUGIN to compile code for Netscape or IE Plug-in
  //#define IHAVENOHEAD for no head
  //#define MINIMALVM to make small small vm
--- 14,21 ----
  *  Mar  17th, 2002, JMM look into sleep wakeup issues under os-9 on some computers.
  *  Apr  17th, 2002, JMM Use accessors for VM variables, add os-9 check, plus changes by Alain Fischer <ala...@bl...> to look for image and fetch VM version under os-x
+ *  Apr  3rd, 2003, JMM use BROWSERPLUGIN
  ****************************************************************************/
  
! //#define BROWSERPLUGIN to compile code for Netscape or IE Plug-in
  //#define IHAVENOHEAD for no head
  //#define MINIMALVM to make small small vm
***************
*** 105,109 ****
  ThreadEntryUPP  gSqueakThreadUPP;
  
! #ifdef PLUGIN
  /*** Variables -- Imported from Browser Plugin Module ***/
  extern int pluginArgCount;
--- 106,110 ----
  ThreadEntryUPP  gSqueakThreadUPP;
  
! #ifdef BROWSERPLUGIN
  /*** Variables -- Imported from Browser Plugin Module ***/
  extern int pluginArgCount;
***************
*** 123,127 ****
  /*** Main ***/
  
! #ifndef PLUGIN
  #if defined ( __APPLE__ ) && defined ( __MACH__ )
  /*** Variables -- globals for access from pluggable primitives ***/
--- 124,128 ----
  /*** Main ***/
  
! #ifndef BROWSERPLUGIN
  #if defined ( __APPLE__ ) && defined ( __MACH__ )
  /*** Variables -- globals for access from pluggable primitives ***/
***************
*** 284,288 ****
  #endif
  
! #ifdef PLUGIN
  OSErr createNewThread() {
  #if I_AM_CARBON_EVENT && defined ( __APPLE__ ) && defined ( __MACH__ )
--- 285,289 ----
  #endif
  
! #ifdef BROWSERPLUGIN
  OSErr createNewThread() {
  #if I_AM_CARBON_EVENT && defined ( __APPLE__ ) && defined ( __MACH__ )
***************
*** 395,399 ****
  }
  
! #ifndef PLUGIN
  int ioExit(void) {
      UnloadScrap();
--- 396,400 ----
  }
  
! #ifndef BROWSERPLUGIN
  int ioExit(void) {
      UnloadScrap();
***************
*** 406,410 ****
  
  void SqueakTerminate() {
! #ifdef PLUGIN
  	ExitCleanup();
  #else
--- 407,411 ----
  
  void SqueakTerminate() {
! #ifdef BROWSERPLUGIN
  	ExitCleanup();
  #else
***************
*** 441,445 ****
  	if (id == 2) return documentName;
  
! #ifdef PLUGIN
  	/* When running in browser, return the EMBED tag info */
  	if ((id > 2) && (id <= (2 + (2 * pluginArgCount)))) {
--- 442,446 ----
  	if (id == 2) return documentName;
  
! #ifdef BROWSERPLUGIN
  	/* When running in browser, return the EMBED tag info */
  	if ((id > 2) && (id <= (2 + (2 * pluginArgCount)))) {
***************
*** 522,526 ****
  }
  
! #ifdef PLUGIN
  
  /*** Plugin Support ***/
--- 523,527 ----
  }
  
! #ifdef BROWSERPLUGIN
  
  /*** Plugin Support ***/
***************
*** 550,553 ****
--- 551,556 ----
  
  int plugInShutdown(void) {
+         int err;
+         
  	ioShutdownAllModules();
  	FreeClipboard();
***************
*** 557,561 ****
  	        DisposeThread(gSqueakThread,null,true);
  #if I_AM_CARBON_EVENT && defined ( __APPLE__ ) && defined ( __MACH__ )
!         pthread_cancel(gSqueakPThread);
          pthread_join(gSqueakPThread,NULL);
          pthread_mutex_destroy(&gEventQueueLock);
--- 560,565 ----
  	        DisposeThread(gSqueakThread,null,true);
  #if I_AM_CARBON_EVENT && defined ( __APPLE__ ) && defined ( __MACH__ )
!         err = pthread_cancel(gSqueakPThread);
!         if (err == 0 )
          pthread_join(gSqueakPThread,NULL);
          pthread_mutex_destroy(&gEventQueueLock);