diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-03-22 03:25:11 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-03-24 06:16:04 +0100 |
| commit | 22481bf76d129d3c41d20b96b6587ef085be485b (patch) | |
| tree | 8c8de852e945dd5422a83bc7e0c37548d2911fe2 /openbsc/include/vty | |
| parent | b973955295b720b8ba7c556d0165750ed9bfb381 (diff) | |
| parent | 61b4232c6363ff9d78ef73b9dbf47ec16c94d610 (diff) | |
Merge remote branch 'origin/master' into on-waves/bsc-master
* Move to libosmocore
* Move to new debugging architecture
* Register the BTS types
* Has only been compile tested
Conflicts:
openbsc/include/openbsc/Makefile.am
openbsc/include/openbsc/gsm_data.h
openbsc/include/openbsc/ipaccess.h
openbsc/include/openbsc/mgcp.h
openbsc/include/openbsc/msgb.h
openbsc/include/openbsc/tlv.h
openbsc/src/Makefile.am
openbsc/src/abis_rsl.c
openbsc/src/bsc_init.c
openbsc/src/bsc_mgcp.c
openbsc/src/chan_alloc.c
openbsc/src/debug.c
openbsc/src/gsm_subscriber_base.c
openbsc/src/msgb.c
openbsc/src/rest_octets.c
openbsc/src/sccp/sccp.c
openbsc/src/vty/command.c
openbsc/src/vty_interface.c
openbsc/tests/Makefile.am
Diffstat (limited to 'openbsc/include/vty')
| -rw-r--r-- | openbsc/include/vty/command.h | 2 | ||||
| -rw-r--r-- | openbsc/include/vty/vector.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/openbsc/include/vty/command.h b/openbsc/include/vty/command.h index dc12c5258..31dd7f3b2 100644 --- a/openbsc/include/vty/command.h +++ b/openbsc/include/vty/command.h @@ -358,4 +358,6 @@ void host_config_set(const char *); void print_version(const char *); +extern void *tall_vty_cmd_ctx; + #endif /* _ZEBRA_COMMAND_H */ diff --git a/openbsc/include/vty/vector.h b/openbsc/include/vty/vector.h index 00f0079f3..22a184d61 100644 --- a/openbsc/include/vty/vector.h +++ b/openbsc/include/vty/vector.h @@ -59,4 +59,6 @@ vector vector_copy(vector v); void *vector_lookup(vector, unsigned int); void *vector_lookup_ensure(vector, unsigned int); +extern void *tall_vty_vec_ctx; + #endif /* _ZEBRA_VECTOR_H */ |