diff options
| author | Scott Anderson <saa@android.com> | 2012-06-05 18:17:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-05 18:17:37 -0700 |
| commit | 845f106a93d5f8ed710c80293d22d23e1b17ed3c (patch) | |
| tree | d97422bb763ec1658718d855e9ca652d6f71be8c /adb/sysdeps.h | |
| parent | dd32794a29ddd3b630b8eb7f8032c168a13b2cb4 (diff) | |
| parent | 1b7a7e81195ff06a7482f81cb92b094bb3481cb1 (diff) | |
| download | system_core-845f106a93d5f8ed710c80293d22d23e1b17ed3c.tar.gz system_core-845f106a93d5f8ed710c80293d22d23e1b17ed3c.tar.bz2 system_core-845f106a93d5f8ed710c80293d22d23e1b17ed3c.zip | |
am 1b7a7e81: adb: Use bionic\'s strtok_r() for Windows
* commit '1b7a7e81195ff06a7482f81cb92b094bb3481cb1':
adb: Use bionic's strtok_r() for Windows
Diffstat (limited to 'adb/sysdeps.h')
| -rw-r--r-- | adb/sysdeps.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/adb/sysdeps.h b/adb/sysdeps.h index b5180761..605fa178 100644 --- a/adb/sysdeps.h +++ b/adb/sysdeps.h @@ -254,6 +254,8 @@ static __inline__ int adb_is_absolute_host_path( const char* path ) return isalpha(path[0]) && path[1] == ':' && path[2] == '\\'; } +extern char* adb_strtok_r(char *str, const char *delim, char **saveptr); + #else /* !_WIN32 a.k.a. Unix */ #include "fdevent.h" @@ -490,6 +492,13 @@ static __inline__ int adb_is_absolute_host_path( const char* path ) return path[0] == '/'; } +static __inline__ char* adb_strtok_r(char *str, const char *delim, char **saveptr) +{ + return strtok_r(str, delim, saveptr); +} +#undef strtok_r +#define strtok_r ___xxx_strtok_r + #endif /* !_WIN32 */ #endif /* _ADB_SYSDEPS_H */ |