From: Michael Jerris <mike@jerris.com>
Date: Thu, 18 Jun 2009 23:15:59 +0000 (+0000)
Subject: fix sofia and apr includes stomping on each other on older apr versions
X-Git-Tag: v1.0.4~421
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0108797fc7890aac30ca908f641495388e77df1c;p=thirdparty%2Ffreeswitch.git

fix sofia and apr includes stomping on each other on older apr versions

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13854 d0543943-73ff-0310-b7d9-9358b9ac24b2
---

diff --git a/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_client_agent.c b/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_client_agent.c
index f193b0dd97..d89aa9be3d 100644
--- a/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_client_agent.c
+++ b/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_client_agent.c
@@ -20,12 +20,14 @@ typedef struct mrcp_sofia_agent_t mrcp_sofia_agent_t;
 typedef struct mrcp_sofia_session_t mrcp_sofia_session_t;
 #define NUA_HMAGIC_T mrcp_sofia_session_t
 
-#include <apr_general.h>
 #include <sofia-sip/su.h>
 #include <sofia-sip/nua.h>
 #include <sofia-sip/sip_status.h>
 #include <sofia-sip/sdp.h>
 #include <sofia-sip/sofia_features.h>
+#undef strcasecmp
+#undef strncasecmp
+#include <apr_general.h>
 
 #include "mrcp_sofiasip_client_agent.h"
 #include "mrcp_session.h"
diff --git a/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_server_agent.c b/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_server_agent.c
index 0d0c16a102..cb8e112a4a 100644
--- a/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_server_agent.c
+++ b/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_server_agent.c
@@ -20,12 +20,14 @@ typedef struct mrcp_sofia_agent_t mrcp_sofia_agent_t;
 typedef struct mrcp_sofia_session_t mrcp_sofia_session_t;
 #define NUA_HMAGIC_T mrcp_sofia_session_t
 
-#include <apr_general.h>
 #include <sofia-sip/su.h>
 #include <sofia-sip/nua.h>
 #include <sofia-sip/sip_status.h>
 #include <sofia-sip/sdp.h>
 #include <sofia-sip/sofia_features.h>
+#undef strcasecmp
+#undef strncasecmp
+#include <apr_general.h>
 
 #include "mrcp_sofiasip_server_agent.h"
 #include "mrcp_session.h"