Index: net/third_party/nss/ssl/sslmutex.h |
diff --git a/net/third_party/nss/ssl/sslmutex.h b/net/third_party/nss/ssl/sslmutex.h |
index d374a883b7328ad85cf54109cb16618aed5e3253..7611148adcef3eb6d52ddcf8e7fa8729b809c06f 100644 |
--- a/net/third_party/nss/ssl/sslmutex.h |
+++ b/net/third_party/nss/ssl/sslmutex.h |
@@ -4,20 +4,20 @@ |
#ifndef __SSLMUTEX_H_ |
#define __SSLMUTEX_H_ 1 |
-/* What SSL really wants is portable process-shared unnamed mutexes in |
+/* 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. |
- * NSPR doesn't provide that. |
- * Windows has mutexes that meet that description, but they're not portable. |
- * POSIX mutexes are not automatically released when the holder dies, |
- * and other processes/threads cannot release the mutex on behalf of the |
- * dead holder. |
- * POSIX semaphores can be used to accomplish this on systems that implement |
- * process-shared unnamed POSIX semaphores, because a watchdog thread can |
- * discover and release semaphores that were held by a dead process. |
- * On systems that do not support process-shared POSIX unnamed semaphores, |
- * they can be emulated using pipes. |
+ * them dies, they are released automatically, and that (unlike fcntl |
+ * record locking) lock to the thread, not to the process. |
+ * NSPR doesn't provide that. |
+ * Windows has mutexes that meet that description, but they're not portable. |
+ * POSIX mutexes are not automatically released when the holder dies, |
+ * and other processes/threads cannot release the mutex on behalf of the |
+ * dead holder. |
+ * POSIX semaphores can be used to accomplish this on systems that implement |
+ * process-shared unnamed POSIX semaphores, because a watchdog thread can |
+ * discover and release semaphores that were held by a dead process. |
+ * On systems that do not support process-shared POSIX unnamed semaphores, |
+ * they can be emulated using pipes. |
* The performance cost of doing that is not yet measured. |
* |
* So, this API looks a lot like POSIX pthread mutexes. |
@@ -34,8 +34,7 @@ |
#include <wtypes.h> |
-typedef struct |
-{ |
+typedef struct { |
PRBool isMultiProcess; |
#ifdef WINNT |
/* on WINNT we need both the PRLock and the Win32 mutex for fibers */ |
@@ -43,25 +42,25 @@ typedef struct |
#else |
union { |
#endif |
- PRLock* sslLock; |
+ PRLock *sslLock; |
HANDLE sslMutx; |
} u; |
} sslMutex; |
-typedef int sslPID; |
+typedef int sslPID; |
#elif defined(LINUX) || defined(AIX) || defined(BEOS) || defined(BSDI) || (defined(NETBSD) && __NetBSD_Version__ < 500000000) || defined(OPENBSD) |
#include <sys/types.h> |
#include "prtypes.h" |
-typedef struct { |
+typedef struct { |
PRBool isMultiProcess; |
union { |
- PRLock* sslLock; |
+ PRLock *sslLock; |
struct { |
- int mPipes[3]; |
- PRInt32 nWaiters; |
+ int mPipes[3]; |
+ PRInt32 nWaiters; |
} pipeStr; |
} u; |
} sslMutex; |
@@ -70,15 +69,14 @@ typedef pid_t sslPID; |
/* 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 */ |
+#include <sys/types.h> /* for pid_t */ |
+#include <semaphore.h> /* for sem_t, and sem_* functions */ |
-typedef struct |
-{ |
+typedef struct { |
PRBool isMultiProcess; |
union { |
- PRLock* sslLock; |
- sem_t sem; |
+ PRLock *sslLock; |
+ sem_t sem; |
} u; |
} sslMutex; |
@@ -88,10 +86,10 @@ typedef pid_t sslPID; |
/* what platform is this ?? */ |
-typedef struct { |
+typedef struct { |
PRBool isMultiProcess; |
union { |
- PRLock* sslLock; |
+ PRLock *sslLock; |
/* include cross-process locking mechanism here */ |
} u; |
} sslMutex; |
@@ -111,7 +109,7 @@ 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 |
+ * with the current process. Leave any shared resources (including the state of |
* shared memory) intact. */ |
extern SECStatus sslMutex_Destroy(sslMutex *sem, PRBool processLocal); |