summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Engert <kaie@kuix.de>2017-12-07 12:18:09 +0100
committerKai Engert <kaie@kuix.de>2017-12-07 12:18:09 +0100
commitdd0cd3a98baadd27f40632fcfb587c3c467fbe25 (patch)
tree086dd217af88f140264c0b343ceb0eba8568064c
parent039596a6b6819a5ad08b5d79b0f29a4b442c554a (diff)
downloadnspr-hg-dd0cd3a98baadd27f40632fcfb587c3c467fbe25.tar.gz
Bug 1399746, backout patch that was landed accidentally, r=glandium for backoutNSPR_4_18_BETA3
-rw-r--r--pr/src/pthreads/ptthread.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/pr/src/pthreads/ptthread.c b/pr/src/pthreads/ptthread.c
index e57abd61..9e12606e 100644
--- a/pr/src/pthreads/ptthread.c
+++ b/pr/src/pthreads/ptthread.c
@@ -1064,11 +1064,6 @@ void PR_HPUX10xInit(shl_t handle, int loading)
void _PR_Fini(void)
{
- /* We disable the cleanup code on Mac OSX, see bug 1399746.
- * The .dylib containing NSPR can get unloaded, and _PR_Fini called,
- * and other code calling NSPR functions can get executed afterwards.
- */
-#ifndef DARWIN
void *thred;
int rv;
@@ -1100,7 +1095,6 @@ void _PR_Fini(void)
pt_book.keyCreated = PR_FALSE;
/* TODO: free other resources used by NSPR */
/* _pr_initialized = PR_FALSE; */
-#endif
} /* _PR_Fini */
PR_IMPLEMENT(PRStatus) PR_Cleanup(void)