diff options
author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-05-11 14:28:25 +0200 |
---|---|---|
committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-11-24 16:58:30 +0100 |
commit | 402006dfdf84c3bf3b22a48ba6ef6922ff6991c7 (patch) | |
tree | a92ad1113e1d1e2220bdd5fbdf30a6414e7b9bb4 /openbsc/src | |
parent | c69ee8527c8ec88bdbff820d0a8aa706502516a5 (diff) |
define mncc_recv_cb_t to avoid code dup
Put mncc_recv_cb_t in common_cs.h to avoid header include complications: if placing
right above struct gsm_network, one must include gsm_data.h to use
mncc_recv_cb_t as function parameter in a header, which will include
gsm_data_shared.h, which will include common_cs.h (future knowledge). Since I will
need to use mncc_recv_cb_t in common_cs.h, including gsm_data.h from there would
introduce an #include loop. Avoid that and define mncc_recv_cb_t in common_cs.h to
begin with.
Change-Id: I2e64cffa563750ce9f3172ffba6f9cf5b9280e9c
Diffstat (limited to 'openbsc/src')
-rw-r--r-- | openbsc/src/libbsc/bsc_init.c | 3 | ||||
-rw-r--r-- | openbsc/src/libbsc/net_init.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/openbsc/src/libbsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c index bf6e056a2..a1becf849 100644 --- a/openbsc/src/libbsc/bsc_init.c +++ b/openbsc/src/libbsc/bsc_init.c @@ -475,8 +475,7 @@ static int bootstrap_bts(struct gsm_bts *bts) return 0; } -int bsc_bootstrap_network(int (*mncc_recv)(struct gsm_network *, struct msgb *), - const char *config_file) +int bsc_bootstrap_network(mncc_recv_cb_t mncc_recv, const char *config_file) { struct gsm_bts *bts; int rc; diff --git a/openbsc/src/libbsc/net_init.c b/openbsc/src/libbsc/net_init.c index 57e359909..da13a52f6 100644 --- a/openbsc/src/libbsc/net_init.c +++ b/openbsc/src/libbsc/net_init.c @@ -26,7 +26,7 @@ struct gsm_network *gsm_network_init(void *ctx, uint16_t country_code, uint16_t network_code, - int (*mncc_recv)(struct gsm_network *, struct msgb *)) + mncc_recv_cb_t mncc_recv) { struct gsm_network *net; const char *default_regexp = ".*"; |