diff options
| author | Kevin Jacobs <kjacobs@mozilla.com> | 2020-03-23 20:47:31 +0000 |
|---|---|---|
| committer | Kevin Jacobs <kjacobs@mozilla.com> | 2020-03-23 20:47:31 +0000 |
| commit | 8532767a723ddd02329abd89eec269fec97a29a8 (patch) | |
| tree | e5b687f829802005dee2e3de160b12eeb481adcd | |
| parent | 8878944c9754cd5ab46feb2db8099153ae7a5dd7 (diff) | |
| download | nss-hg-8532767a723ddd02329abd89eec269fec97a29a8.tar.gz | |
Bug 1624402 - Fix compilation error when NO_FORK_CHECK and CHECK_FORK_* are defined r=rrelyea
Differential Revision: https://phabricator.services.mozilla.com/D67911
| -rw-r--r-- | lib/softoken/pkcs11.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/softoken/pkcs11.c b/lib/softoken/pkcs11.c index e9d9c70c0..3ac18c267 100644 --- a/lib/softoken/pkcs11.c +++ b/lib/softoken/pkcs11.c @@ -3410,6 +3410,7 @@ nsc_CommonFinalize(CK_VOID_PTR pReserved, PRBool isFIPS) nsc_init = PR_FALSE; +#ifndef NO_FORK_CHECK #ifdef CHECK_FORK_MIXED if (!usePthread_atfork) { myPid = 0; /* allow CHECK_FORK in the next softoken initialization to @@ -3422,6 +3423,7 @@ nsc_CommonFinalize(CK_VOID_PTR pReserved, PRBool isFIPS) #elif defined(CHECK_FORK_PTHREAD) forked = PR_FALSE; /* allow reinitialization */ #endif +#endif return CKR_OK; } |