From 1ba14173313beeae18b600d4c889521822821a07 Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Sun, 25 Mar 2012 16:41:14 +0200 Subject: [PATCH] Fixed compiling issues when enabling GSM MS side support. --- appbridge.cpp | 2 +- apppbx.cpp | 4 ++-- mncc.h | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/appbridge.cpp b/appbridge.cpp index 7309c80..e94de02 100644 --- a/appbridge.cpp +++ b/appbridge.cpp @@ -148,7 +148,7 @@ fail: #endif #ifdef WITH_GSM_MS if (interface_out->gsm_ms) { - port = new Pgsm_bs(PORT_TYPE_GSM_MS_OUT, portname, &port_settings, interface_out); + port = new Pgsm_ms(PORT_TYPE_GSM_MS_OUT, portname, &port_settings, interface_out); } else #endif { diff --git a/apppbx.cpp b/apppbx.cpp index bacdba9..c80c20a 100644 --- a/apppbx.cpp +++ b/apppbx.cpp @@ -753,7 +753,7 @@ void EndpointAppPBX::out_setup(int cfnr) earlyb = (interface->is_earlyb == IS_YES); } else #endif -#ifdef WITH_GSM_MS +#ifdef WITH_SIP if (interface->sip) { SPRINT(portname, "%s-%d-out", interface->name, 0); port = new Psip(PORT_TYPE_SIP_OUT, portname, &port_settings, interface); @@ -1021,7 +1021,7 @@ void EndpointAppPBX::out_setup(int cfnr) earlyb = (interface->is_earlyb == IS_YES); } else #endif -#ifdef WITH_GSM_MS +#ifdef WITH_SIP if (interface->sip) { SPRINT(portname, "%s-%d-out", interface->name, 0); port = new Psip(PORT_TYPE_SIP_OUT, portname, &port_settings, interface); diff --git a/mncc.h b/mncc.h index 14dd6d4..25af62a 100644 --- a/mncc.h +++ b/mncc.h @@ -192,12 +192,12 @@ struct gsm_data_frame { }; struct gsm_mncc_rtp { - uint32_t msg_type; - uint32_t callref; - uint32_t ip; - uint16_t port; - uint32_t payload_type; - uint32_t payload_msg_type; + u_int32_t msg_type; + u_int32_t callref; + u_int32_t ip; + u_int16_t port; + u_int32_t payload_type; + u_int32_t payload_msg_type; }; -- 2.13.6