Merge branch 'master' of gitosis@bs11-abis.gnumonks.org:openbsc

This commit is contained in:
Harald Welte 2009-06-14 22:15:32 +08:00
commit ff87157b65
3 changed files with 3 additions and 3 deletions

View File

@ -1,3 +1,3 @@
SUBDIRS = openbsc vty
noinst_HEADERS = mISDNif.h
noinst_HEADERS = mISDNif.h compat_af_isdn.h

View File

@ -388,7 +388,7 @@ enum gsm_e1_event {
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);

View File

@ -174,7 +174,7 @@ enum gsm_bts_type parse_btstype(char *arg)
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";