fix build.

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@275 a93c3328-9c30-0410-af19-c9cd2b2d52af

diff --git a/libs/freetdm/mod_openzap/mod_openzap.c b/libs/freetdm/mod_openzap/mod_openzap.c
index 76436f8fb7b3da75c096ebfb9ca7dabcd2e1e76a..91d807120a936298772be15b4dd02bf01c256c99 100644 (file)
--- a/libs/freetdm/mod_openzap/mod_openzap.c
+++ b/libs/freetdm/mod_openzap/mod_openzap.c
@@ -914,7 +914,6 @@ static ZIO_SIGNAL_CB_FUNCTION(on_fxs_signal)
 {
        switch_core_session_t *session = NULL;
        switch_channel_t *channel = NULL;
-       private_t *tech_pvt = NULL;
        zap_status_t status = ZAP_SUCCESS;
 
     zap_log(ZAP_LOG_DEBUG, "got FXS sig [%s]\n", zap_signal_event2str(sigmsg->event_id));
@@ -962,7 +961,6 @@ static ZIO_SIGNAL_CB_FUNCTION(on_isdn_signal)
 {
        switch_core_session_t *session = NULL;
        switch_channel_t *channel = NULL;
-       zap_status_t status;
 
        zap_log(ZAP_LOG_DEBUG, "got ISDN sig [%s]\n", zap_signal_event2str(sigmsg->event_id));
 
@@ -1046,7 +1044,7 @@ static void zap_logger(char *file, const char *func, int line, int level, char *
     va_start(ap, fmt);
 
        if (switch_vasprintf(&data, fmt, ap) != -1) {
-               switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, level, data);
+               switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, level, data);
                free(data);
        }
        

diff --git a/libs/freetdm/src/include/zap_zt.h b/libs/freetdm/src/include/zap_zt.h
index 35d9cd8d23f0653740ef369a794017a36455b083..031a80d059bda414849018036c0901889b679795 100644 (file)
--- a/libs/freetdm/src/include/zap_zt.h
+++ b/libs/freetdm/src/include/zap_zt.h
@@ -198,18 +198,18 @@ typedef enum {
 } zt_maintenance_mode_t;
 
 typedef enum {
-/* Signalling type */\r
-ZT_SIG_NONE                                    = 0,                                            /* chan not configured. */\r
-\r
-ZT_SIG_FXSLS                           = ((1 << 0) | (1 << 13)),       /* FXS, Loopstart */\r
-ZT_SIG_FXSGS                           = ((1 << 1) | (1 << 13)),       /* FXS, Groundstart */\r
-ZT_SIG_FXSKS                           = ((1 << 2) | (1 << 13)),       /* FXS, Kewlstart */\r
-ZT_SIG_FXOLS                           = ((1 << 3) | (1 << 12)),       /* FXO, Loopstart */\r
-ZT_SIG_FXOGS                           = ((1 << 4) | (1 << 12)),       /* FXO, Groupstart */\r
-ZT_SIG_FXOKS                           = ((1 << 5) | (1 << 12)),       /* FXO, Kewlstart */\r
-ZT_SIG_EM                                      = (1 << 6)                                      /* E&M */\r
+/* Signalling type */
+ZT_SIG_NONE                                    = 0,                                            /* chan not configured. */
+
+ZT_SIG_FXSLS                           = ((1 << 0) | (1 << 13)),       /* FXS, Loopstart */
+ZT_SIG_FXSGS                           = ((1 << 1) | (1 << 13)),       /* FXS, Groundstart */
+ZT_SIG_FXSKS                           = ((1 << 2) | (1 << 13)),       /* FXS, Kewlstart */
+ZT_SIG_FXOLS                           = ((1 << 3) | (1 << 12)),       /* FXO, Loopstart */
+ZT_SIG_FXOGS                           = ((1 << 4) | (1 << 12)),       /* FXO, Groupstart */
+ZT_SIG_FXOKS                           = ((1 << 5) | (1 << 12)),       /* FXO, Kewlstart */
+ZT_SIG_EM                                      = (1 << 6)                                      /* E&M */
 } zt_sigtype_t;
-\r
+
 
 /* Defines */