am eaa91ed1: Merge change I63d524fd into eclair-mr2

Merge commit 'eaa91ed1ee2581b88e555d3573d327ee9864833f' into eclair-mr2-plus-aosp * commit 'eaa91ed1ee2581b88e555d3573d327ee9864833f': Fixing the build by renaming private "string.h" header file.
2009-10-19 13:16:07 -07:00
parent cab9cb1970 eaa91ed1ee
commit b27849d3bf
6 changed files with 5 additions and 5 deletions
--- a/media/libstagefright/HTTPDataSource.cpp
+++ b/media/libstagefright/HTTPDataSource.cpp
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-#include "include/string.h"
+#include "include/stagefright_string.h"
 #include "include/HTTPStream.h"

 #include <stdlib.h>
--- a/media/libstagefright/MediaPlayerImpl.cpp
+++ b/media/libstagefright/MediaPlayerImpl.cpp
@@ -18,7 +18,7 @@
 #define LOG_TAG "MediaPlayerImpl"
 #include "utils/Log.h"

-#include "include/string.h"
+#include "include/stagefright_string.h"
 #include "include/HTTPStream.h"

 #include <OMX_Component.h>
--- a/media/libstagefright/ShoutcastSource.cpp
+++ b/media/libstagefright/ShoutcastSource.cpp
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-#include "include/string.h"
+#include "include/stagefright_string.h"
 #include "include/HTTPStream.h"

 #include <stdlib.h>
--- a/media/libstagefright/include/HTTPStream.h
+++ b/media/libstagefright/include/HTTPStream.h
@@ -18,7 +18,7 @@

 #define HTTP_STREAM_H_

-#include "string.h"
+#include "stagefright_string.h"

 #include <sys/types.h>

--- a/media/libstagefright/include/stagefright_string.h
+++ b/media/libstagefright/include/stagefright_string.h
--- a/media/libstagefright/string.cpp
+++ b/media/libstagefright/string.cpp
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-#include "include/string.h"
+#include "include/stagefright_string.h"

 namespace android {