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

Unified Diff: src/include/threads.h

Issue 3581012: Upgrade from trousers 0.3.3 to 0.3.6 and from testsuite 0.2 to 0.3. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/trousers.git
Patch Set: git cl push Created 10 years, 2 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 | « src/include/tddl.h ('k') | src/include/trousers_types.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/include/threads.h
diff --git a/src/include/threads.h b/src/include/threads.h
index 8cdd8dc1ee3554a7fdc64aa71b1c38686de6d333..3c57144d5015c44aeb2330b97550c25c5cb12a99 100644
--- a/src/include/threads.h
+++ b/src/include/threads.h
@@ -31,7 +31,7 @@
#define COND_SIGNAL(c) pthread_cond_signal(c)
/* thread abstractions */
-#define THREAD_ID ((size_t)pthread_self())
+#define THREAD_ID ((THREAD_TYPE)pthread_self())
#define THREAD_TYPE pthread_t
#define THREAD_JOIN pthread_join
#define THREAD_DETACH pthread_detach
@@ -41,7 +41,7 @@
#define THREAD_EXIT pthread_exit
#define THREAD_CREATE(a,b,c,d) pthread_create(a,b,c,d)
#define THREAD_SET_SIGNAL_MASK pthread_sigmask
-#define THREAD_NULL (THREAD_TYPE)0
+#define THREAD_NULL (THREAD_TYPE *)0
#else
« no previous file with comments | « src/include/tddl.h ('k') | src/include/trousers_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698