| commit | 1dbf33b0ca240d55fea477ecfb79052d9b006b89 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Dec 10 00:16:20 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Dec 10 00:16:20 2014 +0000 |
| tree | f96a3e673737cea04586632999a68fde44a6db5b | |
| parent | 173310a27c1b58034bf47e08e58942137583fea8 [diff] | |
| parent | 298b6c70a084e87e688d19d1b3d609410121cf1d [diff] |
Merge "Fix build on mac."
diff --git a/adb/sysdeps.h b/adb/sysdeps.h index 22f44ce..8d63d14 100644 --- a/adb/sysdeps.h +++ b/adb/sysdeps.h
@@ -524,7 +524,7 @@ static __inline__ unsigned long adb_thread_id() { - return pthread_self(); + return (unsigned long)pthread_self(); } #undef strtok_r