diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-02-26 20:16:37 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-02-26 20:16:45 +0100 |
| commit | 1ebad7437729d6abbf5308de19161b0574e3451a (patch) | |
| tree | 1229a0bfb2bb0093dec05959fd4bbfca557d64c9 /openbsc/src/mgcp | |
| parent | 36ed8cc4c33e3b69bb0f84f1b5b593ae46aff08f (diff) | |
| parent | 140f6e9b12fcb83d161dc1cd8c5d6972ef86fc7c (diff) | |
Merge remote branch 'origin/master' into on-waves/mgcp
Conflicts:
openbsc/include/openbsc/Makefile.am
openbsc/src/Makefile.am
Diffstat (limited to 'openbsc/src/mgcp')
| -rw-r--r-- | openbsc/src/mgcp/mgcp_main.c | 6 | ||||
| -rw-r--r-- | openbsc/src/mgcp/mgcp_network.c | 7 | ||||
| -rw-r--r-- | openbsc/src/mgcp/mgcp_protocol.c | 6 | ||||
| -rw-r--r-- | openbsc/src/mgcp/mgcp_vty.c | 3 |
4 files changed, 12 insertions, 10 deletions
diff --git a/openbsc/src/mgcp/mgcp_main.c b/openbsc/src/mgcp/mgcp_main.c index 32abef2c6..cea0ba427 100644 --- a/openbsc/src/mgcp/mgcp_main.c +++ b/openbsc/src/mgcp/mgcp_main.c @@ -33,10 +33,10 @@ #include <sys/socket.h> #include <openbsc/debug.h> -#include <openbsc/msgb.h> -#include <openbsc/talloc.h> +#include <osmocore/msgb.h> +#include <osmocore/talloc.h> #include <openbsc/gsm_data.h> -#include <openbsc/select.h> +#include <osmocore/select.h> #include <openbsc/mgcp.h> #include <openbsc/telnet_interface.h> diff --git a/openbsc/src/mgcp/mgcp_network.c b/openbsc/src/mgcp/mgcp_network.c index c61f0a858..b76ca4732 100644 --- a/openbsc/src/mgcp/mgcp_network.c +++ b/openbsc/src/mgcp/mgcp_network.c @@ -29,12 +29,13 @@ #include <sys/socket.h> #include <arpa/inet.h> +#include <osmocore/msgb.h> +#include <osmocore/talloc.h> +#include <osmocore/select.h> + #include <openbsc/debug.h> #include <openbsc/mgcp.h> #include <openbsc/mgcp_internal.h> -#include <openbsc/msgb.h> -#include <openbsc/talloc.h> -#include <openbsc/select.h> #warning "Make use of the rtp proxy code" diff --git a/openbsc/src/mgcp/mgcp_protocol.c b/openbsc/src/mgcp/mgcp_protocol.c index e97f1f411..f7ef5470d 100644 --- a/openbsc/src/mgcp/mgcp_protocol.c +++ b/openbsc/src/mgcp/mgcp_protocol.c @@ -31,10 +31,10 @@ #include <unistd.h> #include <openbsc/debug.h> -#include <openbsc/msgb.h> -#include <openbsc/talloc.h> +#include <osmocore/msgb.h> +#include <osmocore/talloc.h> #include <openbsc/gsm_data.h> -#include <openbsc/select.h> +#include <osmocore/select.h> #include <openbsc/mgcp.h> #include <openbsc/mgcp_internal.h> diff --git a/openbsc/src/mgcp/mgcp_vty.c b/openbsc/src/mgcp/mgcp_vty.c index d77646dae..f13b3cfa7 100644 --- a/openbsc/src/mgcp/mgcp_vty.c +++ b/openbsc/src/mgcp/mgcp_vty.c @@ -24,10 +24,11 @@ #include <sys/types.h> +#include <osmocore/talloc.h> + #include <openbsc/debug.h> #include <openbsc/mgcp.h> #include <openbsc/mgcp_internal.h> -#include <openbsc/talloc.h> #include <vty/command.h> #include <vty/vty.h> |