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

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

Issue 14522022: Update NSS libSSL to NSS_3_15_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Make the changes rsleevi suggested Created 7 years, 7 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 /* This Source Code Form is subject to the terms of the Mozilla Public 1 /* This Source Code Form is subject to the terms of the Mozilla Public
2 * License, v. 2.0. If a copy of the MPL was not distributed with this 2 * License, v. 2.0. If a copy of the MPL was not distributed with this
3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4 /* $Id: sslmutex.c,v 1.28 2012/04/25 14:50:12 gerv%gerv.net Exp $ */ 4 /* $Id$ */
5 5
6 #include "seccomon.h" 6 #include "seccomon.h"
7 /* This ifdef should match the one in sslsnce.c */ 7 /* This ifdef should match the one in sslsnce.c */
8 #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 )
9 9
10 #include "sslmutex.h" 10 #include "sslmutex.h"
11 #include "prerr.h" 11 #include "prerr.h"
12 12
13 static SECStatus single_process_sslMutex_Init(sslMutex* pMutex) 13 static SECStatus single_process_sslMutex_Init(sslMutex* pMutex)
14 { 14 {
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 return single_process_sslMutex_Lock(pMutex); 632 return single_process_sslMutex_Lock(pMutex);
633 } 633 }
634 PORT_Assert(!("sslMutex_Lock not implemented for multi-process applications !")); 634 PORT_Assert(!("sslMutex_Lock not implemented for multi-process applications !"));
635 PORT_SetError(PR_NOT_IMPLEMENTED_ERROR); 635 PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
636 return SECFailure; 636 return SECFailure;
637 } 637 }
638 638
639 #endif 639 #endif
640 640
641 #endif 641 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698