From: Andreas Eversberg <jolly@eversberg.eu>
Date: Fri, 27 Jul 2012 07:07:35 +0000 (+0200)
Subject: Fix: Make GSM BS compile without SIP support
X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=commitdiff_plain;h=2ccf098ec01ef0fd577b732b93b0cbef9572fa29

Fix: Make GSM BS compile without SIP support
---

diff --git a/gsm_bs.cpp b/gsm_bs.cpp
index fc59125..3a9ab7d 100644
--- a/gsm_bs.cpp
+++ b/gsm_bs.cpp
@@ -64,6 +64,25 @@ Pgsm_bs::~Pgsm_bs()
 	PDEBUG(DEBUG_GSM, "Destroyed GSM BS process(%s).\n", p_name);
 }
 
+static const char *media_type2name(unsigned char media_type) {
+	switch (media_type) {
+	case MEDIA_TYPE_ULAW:
+		return "PCMU";
+	case MEDIA_TYPE_ALAW:
+		return "PCMA";
+	case MEDIA_TYPE_GSM:
+		return "GSM";
+	case MEDIA_TYPE_GSM_HR:
+		return "GSM-HR";
+	case MEDIA_TYPE_GSM_EFR:
+		return "GSM-EFR";
+	case MEDIA_TYPE_AMR:
+		return "AMR";
+	}
+
+	return "UKN";
+}
+
 /* PROCEEDING INDICATION (from MS) */
 void Pgsm_bs::call_conf_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc *mncc)
 {
@@ -296,7 +315,7 @@ void Pgsm_bs::select_payload_type(struct gsm_mncc *mncc, unsigned char *payload_
 	if ((mncc->fields & MNCC_F_BEARER_CAP)) {
 		/* select preferred payload type from list */
 		int i;
-		uint8_t dynamic_type = 96;
+		unsigned char dynamic_type = 96;
 
 		add_trace("bearer", "capa", "given by MS");
 		for (i = 0; mncc->bearer_cap.speech_ver[i] >= 0; i++) {
diff --git a/sip.cpp b/sip.cpp
index fa351bb..c6670fc 100644
--- a/sip.cpp
+++ b/sip.cpp
@@ -79,7 +79,7 @@ Psip::~Psip()
 	rtp_close();
 }
 
-const char *media_type2name(uint8_t media_type) {
+static const char *media_type2name(uint8_t media_type) {
 	switch (media_type) {
 	case MEDIA_TYPE_ULAW:
 		return "PCMU";