[Freeswitch-svn] [commit] r8353 - in freeswitch/trunk: libs/sofia-sip/libsofia-sip-ua/nta src/include src/mod/applications/mod_conference

[Freeswitch SVN]

Author: mikej
Date: Sat May 10 17:10:19 2008
New Revision: 8353

Modified:
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
   freeswitch/trunk/src/include/switch_cpp.h
   freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c

Log:
fix build

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c	Sat May 10 17:10:19 2008
@@ -170,6 +170,10 @@
 #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,

Modified: freeswitch/trunk/src/include/switch_cpp.h
==============================================================================
--- freeswitch/trunk/src/include/switch_cpp.h	(original)
+++ freeswitch/trunk/src/include/switch_cpp.h	Sat May 10 17:10:19 2008
@@ -310,8 +310,8 @@
 
 	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;

Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	Sat May 10 17:10:19 2008
@@ -4196,11 +4196,13 @@
 		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_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);
 	}