Merge branch 'master' into smgmaster

diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
Simple merge

diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
Simple merge

diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c
Simple merge

diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
index db372b0f97a14061b5f1f0bb9f7d9d46401499de,69016113b06843ed429717b5349a5967ae29e1c9..2794eb497cd90300f3b3e73702b044a52f75c051
--- 1/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
--- 2/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
@@@ -2901,14 -2901,14 +2901,14 @@@ static int ftmod_ss7_fill_in_ccSpan(sng
                g_ftdm_sngss7_data.cfg.isupCkt[x].chan                  = count;
  
                if (timeslot.siglink) {
-                       g_ftdm_sngss7_data.cfg.isupCkt[x].type          = SIG;
+                       g_ftdm_sngss7_data.cfg.isupCkt[x].type          = SNG_CKT_SIG;
                } else if (timeslot.gap) {
-                       g_ftdm_sngss7_data.cfg.isupCkt[x].type          = HOLE;
+                       g_ftdm_sngss7_data.cfg.isupCkt[x].type          = SNG_CKT_HOLE;
                } else {
-                       g_ftdm_sngss7_data.cfg.isupCkt[x].type          = VOICE;
+                       g_ftdm_sngss7_data.cfg.isupCkt[x].type          = SNG_CKT_VOICE;
                        
                        /* throw the flag to indicate that we need to start call control */
 -                      sngss7_set_flag(&g_ftdm_sngss7_data.cfg, SNGSS7_CC);
 +                      sngss7_set_flag(&g_ftdm_sngss7_data.cfg, SNGSS7_CC_PRESENT);
                }
  
                if (timeslot.channel) {