From 63d524fdf0572c821bb1daed099d1b400db4ae3d Mon Sep 17 00:00:00 2001
From: Andreas Huber <andih@google.com>
Date: Mon, 19 Oct 2009 10:15:44 -0700
Subject: [PATCH] Fixing the build by renaming private "string.h" header file.

---
 media/libstagefright/HTTPDataSource.cpp                         | 2 +-
 media/libstagefright/MediaPlayerImpl.cpp                        | 2 +-
 media/libstagefright/ShoutcastSource.cpp                        | 2 +-
 media/libstagefright/include/HTTPStream.h                       | 2 +-
 media/libstagefright/include/{string.h => stagefright_string.h} | 0
 media/libstagefright/string.cpp                                 | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename media/libstagefright/include/{string.h => stagefright_string.h} (100%)

diff --git a/media/libstagefright/HTTPDataSource.cpp b/media/libstagefright/HTTPDataSource.cpp
index fa92024e95ac2..cc25886a5bc64 100644
--- 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>
diff --git a/media/libstagefright/MediaPlayerImpl.cpp b/media/libstagefright/MediaPlayerImpl.cpp
index 3747a8d8a2e10..4e0e996428229 100644
--- 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>
diff --git a/media/libstagefright/ShoutcastSource.cpp b/media/libstagefright/ShoutcastSource.cpp
index d420e6bc27820..ec25430f4e12a 100644
--- 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>
diff --git a/media/libstagefright/include/HTTPStream.h b/media/libstagefright/include/HTTPStream.h
index e05d911a60a5c..43ef614d71a6e 100644
--- 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>
 
diff --git a/media/libstagefright/include/string.h b/media/libstagefright/include/stagefright_string.h
similarity index 100%
rename from media/libstagefright/include/string.h
rename to media/libstagefright/include/stagefright_string.h
diff --git a/media/libstagefright/string.cpp b/media/libstagefright/string.cpp
index a4a1937ca7ae3..bd6204ba1f941 100644
--- 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 {