am 1dbf33b0: Merge "Fix build on mac."

* commit '1dbf33b0ca240d55fea477ecfb79052d9b006b89':
  Fix build on mac.
This commit is contained in:
Elliott Hughes 2014-12-10 02:31:59 +00:00 committed by Android Git Automerger
commit c71562dd9d

View file

@ -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