summaryrefslogtreecommitdiffstats
path: root/openbsc/src/mgcp/mgcp_network.c
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2010-02-26 20:16:37 +0100
committerHolger Hans Peter Freyther <zecke@selfish.org>2010-02-26 20:16:45 +0100
commit1ebad7437729d6abbf5308de19161b0574e3451a (patch)
tree1229a0bfb2bb0093dec05959fd4bbfca557d64c9 /openbsc/src/mgcp/mgcp_network.c
parent36ed8cc4c33e3b69bb0f84f1b5b593ae46aff08f (diff)
parent140f6e9b12fcb83d161dc1cd8c5d6972ef86fc7c (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/mgcp_network.c')
-rw-r--r--openbsc/src/mgcp/mgcp_network.c7
1 files changed, 4 insertions, 3 deletions
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"