Uprev NSS (in libssl) to NSS 3.21

net/third_party/nss/ssl/sslmutex.h

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #ifndef __SSLMUTEX_H_
 #define __SSLMUTEX_H_ 1
 
 /* What SSL really wants is portable process-shared unnamed mutexes in 
  * shared memory, that have the property that if the process that holds
  * them dies, they are released automatically, and that (unlike fcntl 
  * record locking) lock to the thread, not to the process.  
@@ skipping 49 matching lines @@
     union {
         PRLock* sslLock;
         struct {
             int      mPipes[3]; 
             PRInt32  nWaiters;
         } pipeStr;
     } u;
 } sslMutex;
 typedef pid_t sslPID;
 
-#elif defined(XP_UNIX) /* other types of Unix */
+/* other types of unix, except OS X */
+#elif defined(XP_UNIX) && !defined(DARWIN)
 
 #include <sys/types.h>  /* for pid_t */
 #include <semaphore.h>  /* for sem_t, and sem_* functions */
 
 typedef struct
 {
     PRBool isMultiProcess;
     union {
         PRLock* sslLock;
         sem_t  sem;
     } u;
 } sslMutex;
 
 typedef pid_t sslPID;
 
-#else
+#else /* no support for cross-process locking */
 
 /* what platform is this ?? */
 
 typedef struct { 
     PRBool isMultiProcess;
     union {
         PRLock* sslLock;
         /* include cross-process locking mechanism here */
     } u;
 } sslMutex;
 
+#ifdef DARWIN
+typedef pid_t sslPID;
+#else
 typedef int sslPID;
+#endif
 
 #endif
 
 #include "seccomon.h"
 
 SEC_BEGIN_PROTOS
 
 extern SECStatus sslMutex_Init(sslMutex *sem, int shared);
 
 /* If processLocal is set to true, then just free resources which are *only* associated
  * with the current process. Leave any shared resources (including the state of 
  * shared memory) intact. */
 extern SECStatus sslMutex_Destroy(sslMutex *sem, PRBool processLocal);
 
 extern SECStatus sslMutex_Unlock(sslMutex *sem);
 
 extern SECStatus sslMutex_Lock(sslMutex *sem);
 
 #ifdef WINNT
 
 extern SECStatus sslMutex_2LevelInit(sslMutex *sem);
 
 #endif
 
 SEC_END_PROTOS
 
 #endif