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 b784baf665bda5b876be759b9d520f1abf34b411..d374a883b7328ad85cf54109cb16618aed5e3253 100644 |
--- a/net/third_party/nss/ssl/sslmutex.h |
+++ b/net/third_party/nss/ssl/sslmutex.h |
@@ -67,7 +67,8 @@ typedef struct { |
} 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 */ |
@@ -83,7 +84,7 @@ typedef struct |
typedef pid_t sslPID; |
-#else |
+#else /* no support for cross-process locking */ |
/* what platform is this ?? */ |
@@ -95,7 +96,11 @@ typedef struct { |
} u; |
} sslMutex; |
+#ifdef DARWIN |
+typedef pid_t sslPID; |
+#else |
typedef int sslPID; |
+#endif |
#endif |