diff options
| author | Elliott Hughes <enh@google.com> | 2014-12-10 02:31:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-10 02:31:59 +0000 |
| commit | c71562dd9dc73c6d6bd7ccd25e14f0fb35f95e69 (patch) | |
| tree | 8284a2ffe6682c3f7e86a532e4a75ade53142867 | |
| parent | d86af4dc5d4e81834a9c54c9ee7ba1fe6b311e40 (diff) | |
| parent | 1dbf33b0ca240d55fea477ecfb79052d9b006b89 (diff) | |
| download | system_core-c71562dd9dc73c6d6bd7ccd25e14f0fb35f95e69.zip system_core-c71562dd9dc73c6d6bd7ccd25e14f0fb35f95e69.tar.gz system_core-c71562dd9dc73c6d6bd7ccd25e14f0fb35f95e69.tar.bz2 | |
am 1dbf33b0: Merge "Fix build on mac."
* commit '1dbf33b0ca240d55fea477ecfb79052d9b006b89':
Fix build on mac.
| -rw-r--r-- | adb/sysdeps.h | 2 |
1 files changed, 1 insertions, 1 deletions
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__ char* adb_strtok_r(char *str, const char *delim, char **savep static __inline__ unsigned long adb_thread_id() { - return pthread_self(); + return (unsigned long)pthread_self(); } #undef strtok_r |