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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: nss/mozilla/nsprpub/pr/include/md/_pth.h

Issue 3135002: Update to NSS 3.12.7 and NSPR 4.8.6.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/
Patch Set: Created 10 years, 4 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « nss/mozilla/nsprpub/lib/libc/src/plgetopt.c ('k') | nss/mozilla/nsprpub/pr/include/pratom.h » ('j') | nss/mozilla/security/nss/lib/cryptohi/seckey.c » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: nss/mozilla/nsprpub/pr/include/md/_pth.h
===================================================================
--- nss/mozilla/nsprpub/pr/include/md/_pth.h (revision 55475)
+++ nss/mozilla/nsprpub/pr/include/md/_pth.h (working copy)
@@ -98,8 +98,14 @@
#else
#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (EBUSY == pthread_mutex_trylock(&(m)))
#endif
+#if defined(ANDROID)
+/* Conditional attribute init and destroy aren't implemented in bionic. */
+#define _PT_PTHREAD_CONDATTR_INIT(x) 0
+#define _PT_PTHREAD_CONDATTR_DESTROY(x) /* */
+#else
#define _PT_PTHREAD_CONDATTR_INIT pthread_condattr_init
#define _PT_PTHREAD_CONDATTR_DESTROY pthread_condattr_destroy
+#endif
#define _PT_PTHREAD_COND_INIT(m, a) pthread_cond_init(&(m), &(a))
#endif
« no previous file with comments | « nss/mozilla/nsprpub/lib/libc/src/plgetopt.c ('k') | nss/mozilla/nsprpub/pr/include/pratom.h » ('j') | nss/mozilla/security/nss/lib/cryptohi/seckey.c » ('J')

Powered by Google App Engine
This is Rietveld 408576698