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/tests/sccp | |
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/tests/sccp')
-rw-r--r-- | openbsc/tests/sccp/Makefile.am | 4 | ||||
-rw-r--r-- | openbsc/tests/sccp/sccp_test.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/openbsc/tests/sccp/Makefile.am b/openbsc/tests/sccp/Makefile.am index 5a275fc2b..b35693e82 100644 --- a/openbsc/tests/sccp/Makefile.am +++ b/openbsc/tests/sccp/Makefile.am @@ -1,8 +1,8 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall -ggdb3 +AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) noinst_PROGRAMS = sccp_test sccp_test_SOURCES = sccp_test.c -sccp_test_LDADD = $(top_builddir)/src/libsccp.a $(top_builddir)/src/libbsc.a +sccp_test_LDADD = $(top_builddir)/src/libsccp.a $(top_builddir)/src/libbsc.a $(LIBOSMOCORE_LIBS) diff --git a/openbsc/tests/sccp/sccp_test.c b/openbsc/tests/sccp/sccp_test.c index 37615e0e2..982c168be 100644 --- a/openbsc/tests/sccp/sccp_test.c +++ b/openbsc/tests/sccp/sccp_test.c @@ -2,7 +2,7 @@ * SCCP testing code * * (C) 2009 by Holger Hans Peter Freyther <zecke@selfish.org> - * (C) 2009 by on-waves.com + * (C) 2009 by On-Waves * * All Rights Reserved * @@ -26,9 +26,11 @@ #include <arpa/inet.h> -#include <sccp/sccp.h> #include <openbsc/gsm_data.h> #include <openbsc/debug.h> +#include <osmocore/msgb.h> + +#include <sccp/sccp.h> #define MIN(x, y) ((x) < (y) ? (x) : (y)) |