[Amizilla-cvs] amizilla/xpcom/components nsNativeComponentLoader.cpp,1.1.1.2,1.2

[Jeff S. <jsh...@us...>]

Update of /cvsroot/amizilla/amizilla/xpcom/components
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv307

Modified Files:
	nsNativeComponentLoader.cpp 
Log Message:
AmigaOS defines.
I put in code which forceably unloads the DLLs. See if that is needed.


Index: nsNativeComponentLoader.cpp
===================================================================
RCS file: /cvsroot/amizilla/amizilla/xpcom/components/nsNativeComponentLoader.cpp,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -C2 -d -r1.1.1.2 -r1.2
*** nsNativeComponentLoader.cpp	29 Jun 2004 10:42:30 -0000	1.1.1.2
--- nsNativeComponentLoader.cpp	11 Oct 2004 21:09:00 -0000	1.2
***************
*** 246,250 ****
--- 246,256 ----
  
      // Get if the dll was marked for unload in an earlier round
+ #ifdef XP_AMIGAOS
+     // MarkForUnload(PR_TRUE) never called (??)
+     PRBool dllMarkedForUnload = PR_TRUE;
+ #else
+     // 
      PRBool dllMarkedForUnload = dll->IsMarkedForUnload();
+ #endif
  
      // Reset dll marking for unload just in case we return with
***************
*** 261,265 ****
--- 267,277 ----
      if (NS_SUCCEEDED(rv))
      {
+ #ifdef XP_AMIGAOS
+         // is canUnload ever implemented correctly??
+         rv = NS_OK;
+         canUnload = PR_TRUE;
+ #else
          rv = mobj->CanUnload(nsComponentManagerImpl::gComponentManager, &canUnload);
+ #endif
      }
  
***************
*** 298,302 ****
  #endif
  
! #ifdef DEBUG_dougt
              // XXX dlls aren't counting their outstanding instances correctly
              // XXX hence, dont unload until this gets enforced.
--- 310,314 ----
  #endif
  
! #if defined(XP_AMIGAOS) || defined(DEBUG_dougt)
              // XXX dlls aren't counting their outstanding instances correctly
              // XXX hence, dont unload until this gets enforced.
***************
*** 659,662 ****
--- 671,677 ----
          ".so.1.0",  /* Unix: BSD */
          ".sl",      /* Unix: HP-UX */
+ #ifdef XP_AMIGAOS
+         ".ixlibrary", /* AmigaOS */
+ #endif
  #if defined(VMS)
          ".exe",     /* Open VMS */
***************
*** 953,957 ****
  nsNativeComponentLoader::UnloadAll(PRInt32 aWhen)
  {
!     PR_LOG(nsComponentManagerLog, PR_LOG_DEBUG, ("nsNativeComponentLoader: Unloading...."));
  
      struct freeLibrariesClosure callData;
--- 968,972 ----
  nsNativeComponentLoader::UnloadAll(PRInt32 aWhen)
  {
!     PR_LOG(nsComponentManagerLog, PR_LOG_DEBUG, ("nsNativeComponentLoader: Unloading.... %d", aWhen));
  
      struct freeLibrariesClosure callData;