Author: mikej Date: Thu Jun 18 18:15:59 2009 New Revision: 13854 Log: fix sofia and apr includes stomping on each other on older apr versions Modified: freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_client_agent.c freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_server_agent.c Modified: freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_client_agent.c ============================================================================== --- freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_client_agent.c (original) +++ freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_client_agent.c Thu Jun 18 18:15:59 2009 @@ -20,12 +20,14 @@ 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" Modified: freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_server_agent.c ============================================================================== --- freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_server_agent.c (original) +++ freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_server_agent.c Thu Jun 18 18:15:59 2009 @@ -20,12 +20,14 @@ 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"