diff options
author | Harald Welte <laforge@gnumonks.org> | 2011-07-18 14:49:56 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2011-07-18 14:51:16 +0200 |
commit | 71d87b2597bdbb6e555af43831b4ef7788f858e1 (patch) | |
tree | b4f077ebe7474c131cf8f94ceb69e84754bf97e7 | |
parent | f054b51ac960f957f80dafad29a3a827b8b2a2f9 (diff) |
talloc: revert to use talloc inside libosmocore
It's not a good idea to confuse the two changes with each other. Moving the
Abis part into a separate library is independent from the question whether we
have talloc inside libosmocore or use a stand-alone talloc library.
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | src/e1_input.c | 2 | ||||
-rw-r--r-- | src/e1_input_vty.c | 2 | ||||
-rw-r--r-- | src/init.c | 2 | ||||
-rw-r--r-- | src/input/dahdi.c | 2 | ||||
-rw-r--r-- | src/input/hsl.c | 2 | ||||
-rw-r--r-- | src/input/ipa.c | 2 | ||||
-rw-r--r-- | src/input/ipaccess.c | 2 | ||||
-rw-r--r-- | src/input/lapd.c | 2 | ||||
-rw-r--r-- | src/input/misdn.c | 2 | ||||
-rw-r--r-- | src/ipa_proxy.c | 2 | ||||
-rw-r--r-- | src/subchan_demux.c | 2 | ||||
-rw-r--r-- | tests/e1inp_hsl_bsc_test.c | 2 | ||||
-rw-r--r-- | tests/e1inp_hsl_bts_test.c | 2 | ||||
-rw-r--r-- | tests/e1inp_ipa_bsc_test.c | 2 | ||||
-rw-r--r-- | tests/e1inp_ipa_bts_test.c | 2 | ||||
-rw-r--r-- | tests/ipa_proxy_test.c | 2 |
17 files changed, 16 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 84a6dc5..3fdc050 100644 --- a/configure.ac +++ b/configure.ac @@ -37,7 +37,6 @@ AM_CONFIG_HEADER(config.h) PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.0) -PKG_CHECK_MODULES([LIBTALLOC], talloc >= 2.0.1) AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_ERROR(DAHDI input driver headers missing)) diff --git a/src/e1_input.c b/src/e1_input.c index 6873f21..9c2dcb7 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -47,7 +47,7 @@ #include <osmocom/abis/e1_input.h> #include <osmocom/core/linuxlist.h> #include <osmocom/abis/subchan_demux.h> -#include <talloc.h> +#include <osmocom/core/talloc.h> #define NUM_E1_TS 32 diff --git a/src/e1_input_vty.c b/src/e1_input_vty.c index 212a4ac..be51a16 100644 --- a/src/e1_input_vty.c +++ b/src/e1_input_vty.c @@ -31,7 +31,7 @@ #include <osmocom/abis/e1_input.h> #include <osmocom/core/utils.h> #include <osmocom/gsm/gsm_utils.h> -#include <talloc.h> +#include <osmocom/core/talloc.h> #define E1_DRIVER_NAMES "(misdn|dahdi|ipa|hsl)" #define E1_DRIVER_HELP "mISDN supported E1 Card\n" \ @@ -18,7 +18,7 @@ #include "internal.h" #include <osmocom/core/utils.h> #include <osmocom/core/logging.h> -#include <talloc.h> +#include <osmocom/core/talloc.h> void *libosmo_abis_ctx; diff --git a/src/input/dahdi.c b/src/input/dahdi.c index 3d33749..4ad32af 100644 --- a/src/input/dahdi.c +++ b/src/input/dahdi.c @@ -40,7 +40,7 @@ #include <osmocom/core/signal.h> #include <osmocom/abis/subchan_demux.h> #include <osmocom/abis/e1_input.h> -#include <talloc.h> +#include <osmocom/core/talloc.h> #include <osmocom/abis/lapd.h> diff --git a/src/input/hsl.c b/src/input/hsl.c index 9861063..8f2bf73 100644 --- a/src/input/hsl.c +++ b/src/input/hsl.c @@ -52,7 +52,7 @@ #include <osmocom/abis/ipaccess.h> #include <osmocom/core/socket.h> #include <osmocom/abis/ipa.h> -#include <talloc.h> +#include <osmocom/core/talloc.h> #define HSL_TCP_PORT 2500 #define HSL_PROTO_DEBUG 0xdd diff --git a/src/input/ipa.c b/src/input/ipa.c index c8ee781..dd740bf 100644 --- a/src/input/ipa.c +++ b/src/input/ipa.c @@ -15,7 +15,7 @@ #include <osmocom/gsm/tlv.h> #include <osmocom/core/msgb.h> #include <osmocom/core/logging.h> -#include <talloc.h> +#include <osmocom/core/talloc.h> #include <osmocom/abis/e1_input.h> #include <osmocom/abis/ipaccess.h> #include <osmocom/core/socket.h> diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index d977bc2..6d55132 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -39,7 +39,7 @@ #include <osmocom/gsm/tlv.h> #include <osmocom/core/msgb.h> #include <osmocom/core/logging.h> -#include <talloc.h> +#include <osmocom/core/talloc.h> #include <osmocom/abis/e1_input.h> #include <osmocom/abis/ipaccess.h> #include <osmocom/core/socket.h> diff --git a/src/input/lapd.c b/src/input/lapd.c index bd1c8ff..44031bd 100644 --- a/src/input/lapd.c +++ b/src/input/lapd.c @@ -40,7 +40,7 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/core/logging.h> -#include <talloc.h> +#include <osmocom/core/talloc.h> #include <osmocom/core/msgb.h> #include <osmocom/core/timer.h> diff --git a/src/input/misdn.c b/src/input/misdn.c index 252650b..dce4f42 100644 --- a/src/input/misdn.c +++ b/src/input/misdn.c @@ -45,7 +45,7 @@ #include <osmocom/core/msgb.h> #include <osmocom/core/logging.h> #include <osmocom/abis/e1_input.h> -#include <talloc.h> +#include <osmocom/core/talloc.h> #define TS1_ALLOC_SIZE 300 diff --git a/src/ipa_proxy.c b/src/ipa_proxy.c index c79b544..f90eb49 100644 --- a/src/ipa_proxy.c +++ b/src/ipa_proxy.c @@ -17,7 +17,7 @@ #include <osmocom/gsm/tlv.h> #include <osmocom/core/msgb.h> #include <osmocom/core/logging.h> -#include <talloc.h> +#include <osmocom/core/talloc.h> #include <osmocom/abis/e1_input.h> #include <osmocom/abis/ipaccess.h> #include <osmocom/core/socket.h> diff --git a/src/subchan_demux.c b/src/subchan_demux.c index 73efd31..eaf2c83 100644 --- a/src/subchan_demux.c +++ b/src/subchan_demux.c @@ -28,7 +28,7 @@ #include <osmocom/abis/subchan_demux.h> #include <osmocom/abis/trau_frame.h> -#include <talloc.h> +#include <osmocom/core/talloc.h> void *tall_tqe_ctx; diff --git a/tests/e1inp_hsl_bsc_test.c b/tests/e1inp_hsl_bsc_test.c index 96749e3..292a0e3 100644 --- a/tests/e1inp_hsl_bsc_test.c +++ b/tests/e1inp_hsl_bsc_test.c @@ -1,5 +1,5 @@ #include <stdio.h> -#include <talloc.h> +#include <osmocom/core/talloc.h> #include <osmocom/abis/abis.h> #include <osmocom/abis/e1_input.h> #include <osmocom/core/application.h> diff --git a/tests/e1inp_hsl_bts_test.c b/tests/e1inp_hsl_bts_test.c index c9e26f8..272eacf 100644 --- a/tests/e1inp_hsl_bts_test.c +++ b/tests/e1inp_hsl_bts_test.c @@ -1,5 +1,5 @@ #include <stdio.h> -#include <talloc.h> +#include <osmocom/core/talloc.h> #include <string.h> #include <errno.h> #include <unistd.h> diff --git a/tests/e1inp_ipa_bsc_test.c b/tests/e1inp_ipa_bsc_test.c index 4926228..ba3aabb 100644 --- a/tests/e1inp_ipa_bsc_test.c +++ b/tests/e1inp_ipa_bsc_test.c @@ -1,5 +1,5 @@ #include <stdio.h> -#include <talloc.h> +#include <osmocom/core/talloc.h> #include <osmocom/abis/abis.h> #include <osmocom/abis/e1_input.h> #include <osmocom/core/application.h> diff --git a/tests/e1inp_ipa_bts_test.c b/tests/e1inp_ipa_bts_test.c index b62afed..d2a21f9 100644 --- a/tests/e1inp_ipa_bts_test.c +++ b/tests/e1inp_ipa_bts_test.c @@ -1,5 +1,5 @@ #include <stdio.h> -#include <talloc.h> +#include <osmocom/core/talloc.h> #include <string.h> #include <unistd.h> #include <osmocom/abis/abis.h> diff --git a/tests/ipa_proxy_test.c b/tests/ipa_proxy_test.c index 755eec8..b57127a 100644 --- a/tests/ipa_proxy_test.c +++ b/tests/ipa_proxy_test.c @@ -1,5 +1,5 @@ #include <stdio.h> -#include <talloc.h> +#include <osmocom/core/talloc.h> #include <osmocom/abis/abis.h> #include <osmocom/abis/e1_input.h> #include <osmocom/abis/ipa_proxy.h> |