From: Moises Silva <moy@sangoma.com>
Date: Mon, 28 Feb 2011 15:55:40 +0000 (-0500)
Subject: Merge branch 'netborder' of git.sangoma.com:smg_freeswitch into netborder
X-Git-Tag: v1.2-rc1~172^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1b3c595cf0c192d56a3405757f88953bf6cbbb9;p=thirdparty%2Ffreeswitch.git

Merge branch 'netborder' of git.sangoma.com:smg_freeswitch into netborder

Conflicts:
	libs/freetdm/mod_freetdm/mod_freetdm.c
	libs/freetdm/src/ftdm_state.c
---

d1b3c595cf0c192d56a3405757f88953bf6cbbb9
diff --cc libs/freetdm/src/ftdm_state.c
index f37e3d819a,eea3a6a0c0..56fe811dc5
--- a/libs/freetdm/src/ftdm_state.c
+++ b/libs/freetdm/src/ftdm_state.c
@@@ -40,6 -40,22 +40,8 @@@ FTDM_STR2ENUM(ftdm_str2ftdm_channel_sta
  FTDM_ENUM_NAMES(CHANNEL_STATE_STATUS_NAMES, CHANNEL_STATE_STATUS_STRINGS)
  FTDM_STR2ENUM(ftdm_str2ftdm_state_status, ftdm_state_status2str, ftdm_state_status_t, CHANNEL_STATE_STATUS_NAMES, FTDM_STATE_STATUS_INVALID)
  
+ static ftdm_status_t ftdm_core_set_state(const char *file, const char *func, int line, ftdm_channel_t *ftdmchan, ftdm_channel_state_t state, int waitrq);
+ 
 -/* This function is only needed for boost and we should get rid of it at the next refactoring */
 -FT_DECLARE(ftdm_status_t) ftdm_channel_init(ftdm_channel_t *fchan)
 -{
 -	ftdm_channel_lock(fchan);
 -
 -	if (fchan->init_state != FTDM_CHANNEL_STATE_DOWN) {
 -		ftdm_core_set_state(__FILE__, __FUNCTION__, __LINE__, fchan, fchan->init_state, 1);
 -		fchan->init_state = FTDM_CHANNEL_STATE_DOWN;
 -	}
 -
 -	ftdm_channel_unlock(fchan);
 -	return FTDM_SUCCESS;
 -}
 -
  FT_DECLARE(ftdm_status_t) _ftdm_channel_complete_state(const char *file, const char *func, int line, ftdm_channel_t *fchan)
  {
  	uint8_t hindex = 0;