commit a717d5de8e00ae960b31eb3d0f596a51941ad73c
author Harald Welte <laforge@gnumonks.org> Sun Jun 14 22:15:37 2009 +0800
committer Harald Welte <laforge@gnumonks.org> Sun Jun 14 22:15:37 2009 +0800
tree 8e6162c4a84b2604e42ab74e55cbd58500973594
parent ff87157b65b00dae1436e4805b84a6ee3a4144e4
parent 7563ac97c428619f7d69b9f33ca1832127ea082d

Merge branch 'mncc-harald'

openbsc/include/openbsc/gsm_data.h

diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h
index fcc1f2c..a401a47 100644
--- a/openbsc/include/openbsc/gsm_data.h
+++ b/openbsc/include/openbsc/gsm_data.h
@@ -392,7 +392,7 @@
 void set_ts_e1link(struct gsm_bts_trx_ts *ts, u_int8_t e1_nr,
 		   u_int8_t e1_ts, u_int8_t e1_ts_ss);
 enum gsm_bts_type parse_btstype(char *arg);
-char *btstype2str(enum gsm_bts_type type);
+const char *btstype2str(enum gsm_bts_type type);
 struct gsm_bts *gsm_bts_by_lac(struct gsm_network *net, unsigned int lac,
 				struct gsm_bts *start_bts);
 

openbsc/src/gsm_data.c

diff --git a/openbsc/src/gsm_data.c b/openbsc/src/gsm_data.c
index 9ab5895..e71a6cb 100644
--- a/openbsc/src/gsm_data.c
+++ b/openbsc/src/gsm_data.c
@@ -180,7 +180,7 @@
 	return GSM_BTS_TYPE_BS11; /* Default: BS11 */
 }
 
-char *btstype2str(enum gsm_bts_type type)
+const char *btstype2str(enum gsm_bts_type type)
 {
 	if (type > ARRAY_SIZE(bts_types))
 		return "undefined";