Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Side by Side Diff: nss/mozilla/nsprpub/pr/src/md/unix/unix.c

Issue 650104: Update to NSS_3_12_6_RC1 and NSPR_4_8_4_RTM. (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/
Patch Set: Created 10 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ 1 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
2 /* ***** BEGIN LICENSE BLOCK ***** 2 /* ***** BEGIN LICENSE BLOCK *****
3 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 3 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
4 * 4 *
5 * The contents of this file are subject to the Mozilla Public License Version 5 * The contents of this file are subject to the Mozilla Public License Version
6 * 1.1 (the "License"); you may not use this file except in compliance with 6 * 1.1 (the "License"); you may not use this file except in compliance with
7 * the License. You may obtain a copy of the License at 7 * the License. You may obtain a copy of the License at
8 * http://www.mozilla.org/MPL/ 8 * http://www.mozilla.org/MPL/
9 * 9 *
10 * Software distributed under the License is distributed on an "AS IS" basis, 10 * Software distributed under the License is distributed on an "AS IS" basis,
(...skipping 2875 matching lines...) Expand 10 before | Expand all | Expand 10 after
2886 #endif /* HPUX && _PR_DCETHREADS */ 2886 #endif /* HPUX && _PR_DCETHREADS */
2887 2887
2888 _pr_rename_lock = PR_NewLock(); 2888 _pr_rename_lock = PR_NewLock();
2889 PR_ASSERT(NULL != _pr_rename_lock); 2889 PR_ASSERT(NULL != _pr_rename_lock);
2890 _pr_Xfe_mon = PR_NewMonitor(); 2890 _pr_Xfe_mon = PR_NewMonitor();
2891 PR_ASSERT(NULL != _pr_Xfe_mon); 2891 PR_ASSERT(NULL != _pr_Xfe_mon);
2892 2892
2893 _PR_InitIOV(); /* one last hack */ 2893 _PR_InitIOV(); /* one last hack */
2894 } 2894 }
2895 2895
2896 void _PR_UnixCleanup(void)
2897 {
2898 if (_pr_rename_lock) {
2899 PR_DestroyLock(_pr_rename_lock);
2900 _pr_rename_lock = NULL;
2901 }
2902 if (_pr_Xfe_mon) {
2903 PR_DestroyMonitor(_pr_Xfe_mon);
2904 _pr_Xfe_mon = NULL;
2905 }
2906 }
2907
2896 #if !defined(_PR_PTHREADS) 2908 #if !defined(_PR_PTHREADS)
2897 2909
2898 /* 2910 /*
2899 * Variables used by the GC code, initialized in _MD_InitSegs(). 2911 * Variables used by the GC code, initialized in _MD_InitSegs().
2900 */ 2912 */
2901 static PRInt32 _pr_zero_fd = -1; 2913 static PRInt32 _pr_zero_fd = -1;
2902 static PRLock *_pr_md_lock = NULL; 2914 static PRLock *_pr_md_lock = NULL;
2903 2915
2904 /* 2916 /*
2905 * _MD_InitSegs -- 2917 * _MD_InitSegs --
(...skipping 829 matching lines...) Expand 10 before | Expand all | Expand 10 after
3735 rv++; 3747 rv++;
3736 } 3748 }
3737 } 3749 }
3738 PR_ASSERT(rv > 0); 3750 PR_ASSERT(rv > 0);
3739 } 3751 }
3740 PR_ASSERT(-1 != timeout || rv != 0); 3752 PR_ASSERT(-1 != timeout || rv != 0);
3741 3753
3742 return rv; 3754 return rv;
3743 } 3755 }
3744 #endif /* _PR_NEED_FAKE_POLL */ 3756 #endif /* _PR_NEED_FAKE_POLL */
OLDNEW
« no previous file with comments | « nss/mozilla/nsprpub/pr/include/private/primpl.h ('k') | nss/mozilla/nsprpub/pr/src/misc/prinit.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698