fix build

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

diff --git a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
index c3cf55255a7f0e4c65d41769fe443af7caa890c5..85043af31bb1984dc084135947d095571c17960e 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
@@ -170,6 +170,10 @@ static char const * stateless_branch(nta_agent_t *, msg_t *, sip_t const *,
 #define NTA_BRANCH_PRIME SU_U64_C(0xB9591D1C361C6521)
 #define NTA_TAG_PRIME    SU_U64_C(0xB9591D1C361C6521)
 
+#ifndef UINT32_MAX
+#define UINT32_MAX (0xffffffffU)
+#endif
+
 HTABLE_PROTOS_WITH(leg_htable, lht, nta_leg_t, size_t, hash_value_t);
 static nta_leg_t *leg_find(nta_agent_t const *sa,
                           char const *method_name,

diff --git a/src/include/switch_cpp.h b/src/include/switch_cpp.h
index a7819cb4fbed62c4b781e498de99bd7392b57890..775206170a7f783741ef5dd29c60f2b72452b18b 100644 (file)
--- a/src/include/switch_cpp.h
+++ b/src/include/switch_cpp.h
@@ -310,8 +310,8 @@ class CoreSession {
 
        SWITCH_DECLARE(void) sendEvent(Event *sendME);
 
-       SWITCH_DECLARE(void) CoreSession::setEventData(Event *e);
-       SWITCH_DECLARE(char *) CoreSession::getXMLCDR();
+       SWITCH_DECLARE(void) setEventData(Event *e);
+       SWITCH_DECLARE(char *) getXMLCDR();
 
        virtual bool begin_allow_threads() = 0;
        virtual bool end_allow_threads() = 0;

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index eab60e738390f7a35c494c448b78fc8a7d6c7b70..0fc0d1428ede397e572d5a36fe117d438d31082d 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -4196,11 +4196,13 @@ SWITCH_STANDARD_APP(conference_function)
                profile_name = "default";
        }
 
+#if 0
        if (0) {
                member.dtmf_parser = conference->dtmf_parser;
        } else {
                
        }
+#endif
 
        switch_event_create(&params, SWITCH_EVENT_MESSAGE);
        switch_assert(params);
@@ -4521,7 +4523,7 @@ SWITCH_STANDARD_APP(conference_function)
        switch_buffer_destroy(&member.resample_buffer);
        switch_buffer_destroy(&member.audio_buffer);
        switch_buffer_destroy(&member.mux_buffer);
-       if (member.dtmf_parser != conference->dtmf_parser) {
+       if (conference && member.dtmf_parser != conference->dtmf_parser) {
                switch_ivr_digit_stream_parser_destroy(member.dtmf_parser);
        }