diff options
author | Harald Welte <laforge@gnumonks.org> | 2011-03-23 18:26:56 +0100 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2011-03-23 18:33:26 +0100 |
commit | d36ff76f9d24f05145e3cd3f3fceb5262fc746f5 (patch) | |
tree | 3bb6706256efeac4cc8449e61cc0129c0244b0bc | |
parent | 136f453dd2492b95004461a33c90b11732f33bd8 (diff) |
Fix build of bsc-nat and GPRS code after include path change
The last patch changed the osmocore include paths, this fixes some build
problems caused by it
-rw-r--r-- | openbsc/src/gprs/gprs_gmm.c | 4 | ||||
-rw-r--r-- | openbsc/src/gprs/gprs_llc_vty.c | 2 | ||||
-rw-r--r-- | openbsc/src/gprs/gprs_sndcp.h | 2 | ||||
-rw-r--r-- | openbsc/src/gprs/gprs_sndcp_vty.c | 2 | ||||
-rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_api.c | 4 | ||||
-rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_bssap.c | 4 | ||||
-rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_msc.c | 2 | ||||
-rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_rf.c | 2 | ||||
-rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_sccp.c | 4 | ||||
-rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_filter.c | 2 | ||||
-rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c | 4 | ||||
-rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_nat.c | 4 | ||||
-rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_nat_utils.c | 4 | ||||
-rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_ussd.c | 6 |
14 files changed, 23 insertions, 23 deletions
diff --git a/openbsc/src/gprs/gprs_gmm.c b/openbsc/src/gprs/gprs_gmm.c index 43aa2123c..7fd8641b3 100644 --- a/openbsc/src/gprs/gprs_gmm.c +++ b/openbsc/src/gprs/gprs_gmm.c @@ -32,8 +32,8 @@ #include <openbsc/db.h> #include <osmocom/core/msgb.h> -#include <osmocom/core/tlv.h> -#include <osmocom/core/gsm_utils.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/gsm/gsm_utils.h> #include <osmocom/core/signal.h> #include <osmocom/core/talloc.h> #include <osmocom/core/rate_ctr.h> diff --git a/openbsc/src/gprs/gprs_llc_vty.c b/openbsc/src/gprs/gprs_llc_vty.c index 050d0249c..ab5269922 100644 --- a/openbsc/src/gprs/gprs_llc_vty.c +++ b/openbsc/src/gprs/gprs_llc_vty.c @@ -28,7 +28,7 @@ #include <openbsc/gsm_data.h> #include <osmocom/core/msgb.h> -#include <osmocom/core/tlv.h> +#include <osmocom/gsm/tlv.h> #include <osmocom/core/talloc.h> #include <osmocom/core/select.h> #include <osmocom/core/rate_ctr.h> diff --git a/openbsc/src/gprs/gprs_sndcp.h b/openbsc/src/gprs/gprs_sndcp.h index e9a50be1c..ec35d7ba0 100644 --- a/openbsc/src/gprs/gprs_sndcp.h +++ b/openbsc/src/gprs/gprs_sndcp.h @@ -2,7 +2,7 @@ #define _INT_SNDCP_H #include <stdint.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> /* A fragment queue header, maintaining list of fragments for one N-PDU */ struct defrag_state { diff --git a/openbsc/src/gprs/gprs_sndcp_vty.c b/openbsc/src/gprs/gprs_sndcp_vty.c index a6c0bd3c1..28fdc635b 100644 --- a/openbsc/src/gprs/gprs_sndcp_vty.c +++ b/openbsc/src/gprs/gprs_sndcp_vty.c @@ -28,7 +28,7 @@ #include <openbsc/gsm_data.h> #include <osmocom/core/msgb.h> -#include <osmocom/core/tlv.h> +#include <osmocom/gsm/tlv.h> #include <osmocom/core/talloc.h> #include <osmocom/core/select.h> #include <osmocom/core/rate_ctr.h> diff --git a/openbsc/src/osmo-bsc/osmo_bsc_api.c b/openbsc/src/osmo-bsc/osmo_bsc_api.c index aead4c83c..a943a0cff 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_api.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_api.c @@ -21,8 +21,8 @@ #include <openbsc/osmo_msc_data.h> #include <openbsc/debug.h> -#include <osmocom/core/protocol/gsm_08_08.h> -#include <osmocom/core/gsm0808.h> +#include <osmocom/gsm/protocol/gsm_08_08.h> +#include <osmocom/gsm/gsm0808.h> #define return_when_not_connected(conn) \ if (!conn->sccp_con) {\ diff --git a/openbsc/src/osmo-bsc/osmo_bsc_bssap.c b/openbsc/src/osmo-bsc/osmo_bsc_bssap.c index f9dc79a20..5046d8c22 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_bssap.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_bssap.c @@ -26,8 +26,8 @@ #include <openbsc/mgcp.h> #include <openbsc/paging.h> -#include <osmocom/core/gsm0808.h> -#include <osmocom/core/protocol/gsm_08_08.h> +#include <osmocom/gsm/protocol/gsm_08_08.h> +#include <osmocom/gsm/gsm0808.h> #include <arpa/inet.h> diff --git a/openbsc/src/osmo-bsc/osmo_bsc_msc.c b/openbsc/src/osmo-bsc/osmo_bsc_msc.c index 530171e47..135779eaa 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_msc.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_msc.c @@ -27,7 +27,7 @@ #include <openbsc/osmo_msc_data.h> #include <openbsc/signal.h> -#include <osmocom/core/gsm0808.h> +#include <osmocom/gsm/gsm0808.h> #include <osmocom/sccp/sccp.h> diff --git a/openbsc/src/osmo-bsc/osmo_bsc_rf.c b/openbsc/src/osmo-bsc/osmo_bsc_rf.c index 6be9625f4..eb4b867a9 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_rf.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_rf.c @@ -27,7 +27,7 @@ #include <openbsc/osmo_msc_data.h> #include <osmocom/core/talloc.h> -#include <osmocom/core/protocol/gsm_12_21.h> +#include <osmocom/gsm/protocol/gsm_12_21.h> #include <sys/socket.h> #include <sys/un.h> diff --git a/openbsc/src/osmo-bsc/osmo_bsc_sccp.c b/openbsc/src/osmo-bsc/osmo_bsc_sccp.c index bbe4ea562..718f3054e 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_sccp.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_sccp.c @@ -27,9 +27,9 @@ #include <openbsc/ipaccess.h> #include <openbsc/signal.h> -#include <osmocom/core/gsm0808.h> #include <osmocom/core/talloc.h> -#include <osmocom/core/protocol/gsm_08_08.h> +#include <osmocom/gsm/gsm0808.h> +#include <osmocom/gsm/protocol/gsm_08_08.h> #include <osmocom/sccp/sccp.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_filter.c b/openbsc/src/osmo-bsc_nat/bsc_filter.c index 5765a6640..74a5d193f 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_filter.c +++ b/openbsc/src/osmo-bsc_nat/bsc_filter.c @@ -26,7 +26,7 @@ #include <openbsc/debug.h> #include <osmocom/core/talloc.h> -#include <osmocom/core/protocol/gsm_08_08.h> +#include <osmocom/gsm/protocol/gsm_08_08.h> #include <osmocom/sccp/sccp.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c index 0c10d84ac..e3b57d931 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c +++ b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c @@ -29,8 +29,8 @@ #include <osmocom/sccp/sccp.h> #include <osmocom/core/talloc.h> -#include <osmocom/core/gsm0808.h> -#include <osmocom/core/protocol/gsm_08_08.h> +#include <osmocom/gsm/gsm0808.h> +#include <osmocom/gsm/protocol/gsm_08_08.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index fe78ee911..2075ab683 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -44,11 +44,11 @@ #include <openbsc/socket.h> #include <openbsc/vty.h> -#include <osmocom/core/gsm0808.h> +#include <osmocom/gsm/gsm0808.h> #include <osmocom/core/talloc.h> #include <osmocom/core/process.h> -#include <osmocom/core/protocol/gsm_08_08.h> +#include <osmocom/gsm/protocol/gsm_08_08.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/vty.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c index 6068333bb..f83289b61 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c @@ -31,9 +31,9 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/core/talloc.h> -#include <osmocom/core/gsm0808.h> +#include <osmocom/gsm/gsm0808.h> -#include <osmocom/core/protocol/gsm_08_08.h> +#include <osmocom/gsm/protocol/gsm_08_08.h> #include <osmocom/sccp/sccp.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_ussd.c b/openbsc/src/osmo-bsc_nat/bsc_ussd.c index 817433650..14d154d0b 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_ussd.c +++ b/openbsc/src/osmo-bsc_nat/bsc_ussd.c @@ -25,10 +25,10 @@ #include <openbsc/ipaccess.h> #include <openbsc/socket.h> -#include <osmocom/core/protocol/gsm_08_08.h> -#include <osmocom/core/gsm0480.h> +#include <osmocom/gsm/protocol/gsm_08_08.h> +#include <osmocom/gsm/gsm0480.h> #include <osmocom/core/talloc.h> -#include <osmocom/core/tlv.h> +#include <osmocom/gsm/tlv.h> #include <osmocom/sccp/sccp.h> |