summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2009-06-14 22:15:32 +0800
committerHarald Welte <laforge@gnumonks.org>2009-06-14 22:15:32 +0800
commitff87157b65b00dae1436e4805b84a6ee3a4144e4 (patch)
treeb2d26dfde51fddd18b6d650071b05c10f5a3e17d
parentec44e1ff4139f60483dfcaa8329e39b41bfb8c4a (diff)
parent2dceae6ab748044f5cc611cf66d81147625a4e78 (diff)
Merge branch 'master' of gitosis@bs11-abis.gnumonks.org:openbsc
-rw-r--r--openbsc/include/Makefile.am2
-rw-r--r--openbsc/include/openbsc/gsm_data.h2
-rw-r--r--openbsc/src/gsm_data.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/openbsc/include/Makefile.am b/openbsc/include/Makefile.am
index 36d57a3c5..a95129fa9 100644
--- a/openbsc/include/Makefile.am
+++ b/openbsc/include/Makefile.am
@@ -1,3 +1,3 @@
SUBDIRS = openbsc vty
-noinst_HEADERS = mISDNif.h
+noinst_HEADERS = mISDNif.h compat_af_isdn.h
diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h
index 1fb80a2f3..ad6401e9c 100644
--- a/openbsc/include/openbsc/gsm_data.h
+++ b/openbsc/include/openbsc/gsm_data.h
@@ -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);
diff --git a/openbsc/src/gsm_data.c b/openbsc/src/gsm_data.c
index a78425f95..e5e789af2 100644
--- a/openbsc/src/gsm_data.c
+++ b/openbsc/src/gsm_data.c
@@ -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";