From fb116fbea3b5f4ea725c0c3e82e70fd82e0a45c5 Mon Sep 17 00:00:00 2001
From: Chung-yih Wang <cywang@google.com>
Date: Wed, 6 Oct 2010 16:46:59 +0800
Subject: [PATCH] Misc fixes for sim-eng build.

Change-Id: I0c5dac1097abc924e66dab92d7d03d5051b4fd29
---
 voip/jni/rtp/AmrCodec.cpp       | 2 +-
 voip/jni/rtp/EchoSuppressor.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/voip/jni/rtp/AmrCodec.cpp b/voip/jni/rtp/AmrCodec.cpp
index f3ecac25b1f9f..72ee44e69f7a4 100644
--- a/voip/jni/rtp/AmrCodec.cpp
+++ b/voip/jni/rtp/AmrCodec.cpp
@@ -73,7 +73,7 @@ int AmrCodec::set(int sampleRate, const char *fmtp)
     }
 
     // Handle mode-set and octet-align.
-    char *modes = strcasestr(fmtp, "mode-set=");
+    char *modes = (char*)strcasestr(fmtp, "mode-set=");
     if (modes) {
         mMode = 0;
         mModeSet = 0;
diff --git a/voip/jni/rtp/EchoSuppressor.cpp b/voip/jni/rtp/EchoSuppressor.cpp
index 92015a9eb2408..a1a7aed82b799 100644
--- a/voip/jni/rtp/EchoSuppressor.cpp
+++ b/voip/jni/rtp/EchoSuppressor.cpp
@@ -15,6 +15,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <stdint.h>
 #include <math.h>