diff options
author | Mike Lockwood <lockwood@android.com> | 2010-07-15 14:58:25 -0400 |
---|---|---|
committer | Mike Lockwood <lockwood@android.com> | 2010-07-15 15:02:52 -0400 |
commit | 4e2ffa400b82559cab2c5717c8dcdff393d334a9 (patch) | |
tree | 87f5e496695e2d9a2f411916b7e4b6b66317067e /media/libstagefright/rtsp | |
parent | 8065e2056073808716db32136d7acfd50eeab924 (diff) | |
download | frameworks_av-4e2ffa400b82559cab2c5717c8dcdff393d334a9.zip frameworks_av-4e2ffa400b82559cab2c5717c8dcdff393d334a9.tar.gz frameworks_av-4e2ffa400b82559cab2c5717c8dcdff393d334a9.tar.bz2 |
Fixes for simulator build on lucid
strchr and strrchr now return const char* instead of char*
Change-Id: I5ca831b8951af7e6306eb9d9d6f78ed2ec13d649
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'media/libstagefright/rtsp')
-rw-r--r-- | media/libstagefright/rtsp/ARTSPConnection.cpp | 2 | ||||
-rw-r--r-- | media/libstagefright/rtsp/ASessionDescription.cpp | 2 | ||||
-rw-r--r-- | media/libstagefright/rtsp/MyHandler.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/rtsp/ARTSPConnection.cpp b/media/libstagefright/rtsp/ARTSPConnection.cpp index e9162c0..9826990 100644 --- a/media/libstagefright/rtsp/ARTSPConnection.cpp +++ b/media/libstagefright/rtsp/ARTSPConnection.cpp @@ -116,7 +116,7 @@ bool ARTSPConnection::ParseURL( path->setTo(slashPos); } - char *colonPos = strchr(host->c_str(), ':'); + const char *colonPos = strchr(host->c_str(), ':'); if (colonPos != NULL) { unsigned long x; diff --git a/media/libstagefright/rtsp/ASessionDescription.cpp b/media/libstagefright/rtsp/ASessionDescription.cpp index ca4c55e..25b9ce2 100644 --- a/media/libstagefright/rtsp/ASessionDescription.cpp +++ b/media/libstagefright/rtsp/ASessionDescription.cpp @@ -164,7 +164,7 @@ void ASessionDescription::getFormatType( AString format; getFormat(index, &format); - char *lastSpacePos = strrchr(format.c_str(), ' '); + const char *lastSpacePos = strrchr(format.c_str(), ' '); CHECK(lastSpacePos != NULL); char *end; diff --git a/media/libstagefright/rtsp/MyHandler.h b/media/libstagefright/rtsp/MyHandler.h index 74bb798..719ebf3 100644 --- a/media/libstagefright/rtsp/MyHandler.h +++ b/media/libstagefright/rtsp/MyHandler.h @@ -419,7 +419,7 @@ private: out->setTo(baseURL); out->append(url); } else { - char *slashPos = strrchr(baseURL, '/'); + const char *slashPos = strrchr(baseURL, '/'); if (slashPos > &baseURL[6]) { out->setTo(baseURL, slashPos - baseURL); |