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

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

Issue 1511123006: Uprev NSS (in libssl) to NSS 3.21 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated deps Created 5 years 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
« no previous file with comments | « net/third_party/nss/ssl/sslmutex.h ('k') | net/third_party/nss/ssl/sslproto.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4
5 #include "seccomon.h" 5 #include "seccomon.h"
6 /* This ifdef should match the one in sslsnce.c */ 6 /* This ifdef should match the one in sslsnce.c */
7 #if defined(XP_UNIX) || defined(XP_WIN32) || defined (XP_OS2) || defined(XP_BEOS ) 7 #if defined(XP_UNIX) || defined(XP_WIN32) || defined (XP_OS2) || defined(XP_BEOS )
8 8
9 #include "sslmutex.h" 9 #include "sslmutex.h"
10 #include "prerr.h" 10 #include "prerr.h"
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 break; 497 break;
498 } 498 }
499 499
500 if (! (SECSuccess == retvalue && SECSuccess == rv)) { 500 if (! (SECSuccess == retvalue && SECSuccess == rv)) {
501 return SECFailure; 501 return SECFailure;
502 } 502 }
503 503
504 return SECSuccess; 504 return SECSuccess;
505 } 505 }
506 506
507 #elif defined(XP_UNIX) 507 #elif defined(XP_UNIX) && !defined(DARWIN)
508 508
509 #include <errno.h> 509 #include <errno.h>
510 #include "unix_err.h" 510 #include "unix_err.h"
511 511
512 SECStatus 512 SECStatus
513 sslMutex_Init(sslMutex *pMutex, int shared) 513 sslMutex_Init(sslMutex *pMutex, int shared)
514 { 514 {
515 int rv; 515 int rv;
516 PR_ASSERT(pMutex); 516 PR_ASSERT(pMutex);
517 pMutex->isMultiProcess = (PRBool)(shared != 0); 517 pMutex->isMultiProcess = (PRBool)(shared != 0);
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 return single_process_sslMutex_Lock(pMutex); 631 return single_process_sslMutex_Lock(pMutex);
632 } 632 }
633 PORT_Assert(!("sslMutex_Lock not implemented for multi-process applications !")); 633 PORT_Assert(!("sslMutex_Lock not implemented for multi-process applications !"));
634 PORT_SetError(PR_NOT_IMPLEMENTED_ERROR); 634 PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
635 return SECFailure; 635 return SECFailure;
636 } 636 }
637 637
638 #endif 638 #endif
639 639
640 #endif 640 #endif
OLDNEW
« no previous file with comments | « net/third_party/nss/ssl/sslmutex.h ('k') | net/third_party/nss/ssl/sslproto.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698