summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtc%google.com <devnull@localhost>2008-04-26 00:39:35 +0000
committerwtc%google.com <devnull@localhost>2008-04-26 00:39:35 +0000
commit80126842785bcb7ec82e4c1a483a5d66a48dc97e (patch)
tree966d0afd9e71b187c20b1f4d518b9b9bac4626bc
parenta585ff873466e5f863c822b3c68357705f5a5061 (diff)
downloadnspr-hg-80126842785bcb7ec82e4c1a483a5d66a48dc97e.tar.gz
Bug 218846: We need to call _PR_CleanupIO before we start to clean up the
current thread because _PR_CleanupIO needs to acquire a lock, which needs the current thread ID. The patch is contributed by Gerard Roos <gerard.roos@adnovum.ch>. r=wtc.
-rw-r--r--pr/src/misc/prinit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pr/src/misc/prinit.c b/pr/src/misc/prinit.c
index d101d161..dc4ca98c 100644
--- a/pr/src/misc/prinit.c
+++ b/pr/src/misc/prinit.c
@@ -417,6 +417,8 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
_PR_CleanupDtoa();
_PR_CleanupCallOnce();
_PR_ShutdownLinker();
+ _PR_CleanupNet();
+ _PR_CleanupIO();
/* Release the primordial thread's private data, etc. */
_PR_CleanupThread(me);
@@ -446,8 +448,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
* Ideally, for each _PR_InitXXX(), there should be a corresponding
* _PR_XXXCleanup() that we can call here.
*/
- _PR_CleanupNet();
- _PR_CleanupIO();
#ifdef WINNT
_PR_CleanupCPUs();
#endif