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

Side by Side Diff: net/third_party/nss/ssl/sslmutex.c

Issue 11275240: Update net/third_party/nss/ssl to NSS 3.14. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Upload before commit Created 8 years, 1 month 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
« no previous file with comments | « net/third_party/nss/ssl/sslmutex.h ('k') | net/third_party/nss/ssl/sslnonce.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* ***** BEGIN LICENSE BLOCK ***** 1 /* This Source Code Form is subject to the terms of the Mozilla Public
2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 2 * License, v. 2.0. If a copy of the MPL was not distributed with this
3 * 3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4 * The contents of this file are subject to the Mozilla Public License Version 4 /* $Id: sslmutex.c,v 1.28 2012/04/25 14:50:12 gerv%gerv.net Exp $ */
5 * 1.1 (the "License"); you may not use this file except in compliance with
6 * the License. You may obtain a copy of the License at
7 * http://www.mozilla.org/MPL/
8 *
9 * Software distributed under the License is distributed on an "AS IS" basis,
10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
11 * for the specific language governing rights and limitations under the
12 * License.
13 *
14 * The Original Code is the Netscape security libraries.
15 *
16 * The Initial Developer of the Original Code is
17 * Netscape Communications Corporation.
18 * Portions created by the Initial Developer are Copyright (C) 2001
19 * the Initial Developer. All Rights Reserved.
20 *
21 * Contributor(s):
22 *
23 * Alternatively, the contents of this file may be used under the terms of
24 * either the GNU General Public License Version 2 or later (the "GPL"), or
25 * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
26 * in which case the provisions of the GPL or the LGPL are applicable instead
27 * of those above. If you wish to allow use of your version of this file only
28 * under the terms of either the GPL or the LGPL, and not to allow others to
29 * use your version of this file under the terms of the MPL, indicate your
30 * decision by deleting the provisions above and replace them with the notice
31 * and other provisions required by the GPL or the LGPL. If you do not delete
32 * the provisions above, a recipient may use your version of this file under
33 * the terms of any one of the MPL, the GPL or the LGPL.
34 *
35 * ***** END LICENSE BLOCK ***** */
36 /* $Id: sslmutex.c,v 1.27 2011/10/01 00:11:02 wtc%google.com Exp $ */
37 5
38 #include "seccomon.h" 6 #include "seccomon.h"
39 /* This ifdef should match the one in sslsnce.c */ 7 /* This ifdef should match the one in sslsnce.c */
40 #if defined(XP_UNIX) || defined(XP_WIN32) || defined (XP_OS2) || defined(XP_BEOS ) 8 #if defined(XP_UNIX) || defined(XP_WIN32) || defined (XP_OS2) || defined(XP_BEOS )
41 9
42 #include "sslmutex.h" 10 #include "sslmutex.h"
43 #include "prerr.h" 11 #include "prerr.h"
44 12
45 static SECStatus single_process_sslMutex_Init(sslMutex* pMutex) 13 static SECStatus single_process_sslMutex_Init(sslMutex* pMutex)
46 { 14 {
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 return single_process_sslMutex_Lock(pMutex); 632 return single_process_sslMutex_Lock(pMutex);
665 } 633 }
666 PORT_Assert(!("sslMutex_Lock not implemented for multi-process applications !")); 634 PORT_Assert(!("sslMutex_Lock not implemented for multi-process applications !"));
667 PORT_SetError(PR_NOT_IMPLEMENTED_ERROR); 635 PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
668 return SECFailure; 636 return SECFailure;
669 } 637 }
670 638
671 #endif 639 #endif
672 640
673 #endif 641 #endif
OLDNEW
« no previous file with comments | « net/third_party/nss/ssl/sslmutex.h ('k') | net/third_party/nss/ssl/sslnonce.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698