Merge branch 'releases.3.4' of ssh://git.sangoma.com/smg_freeswitch into releases.3.4

This commit is contained in:
David Yat Sin 2012-07-28 10:42:18 -04:00
commit 2a1eb6e8fa
2 changed files with 1 additions and 2 deletions

View File

@ -36,7 +36,6 @@
* David Yat Sin <dyatsin@sangoma.com>
*
*/
#define _GNU_SOURCE
#include "private/ftdm_core.h"
#include <stdarg.h>

View File

@ -213,7 +213,7 @@ ftdm_status_t copy_cdPtyNum_from_sngss7(ftdm_channel_t *ftdmchan, SiCdPtyNum *cd
ftdm_status_t copy_cdPtyNum_to_sngss7(ftdm_channel_t *ftdmchan, SiCdPtyNum *cdPtyNum)
{
char *val = NULL;
const char *val = NULL;
ftdm_caller_data_t *caller_data = &ftdmchan->caller_data;
sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;