pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/38989?usp=email )
Change subject: Drop use of libosmo-abis osmocom/abis/ipaccess.h ......................................................................
Drop use of libosmo-abis osmocom/abis/ipaccess.h
That header is only really used to provide an old hack for ipaccess-proxy tool in openbsc.h/osmo-bsc.h, and will be deprecated soon.
Take the chance to organize a bit better the includes based on dependency chain.
Change-Id: I393cd23a09af6d1eefa68dc955415f4fe334d71b --- M include/osmocom/hlr/gsup_server.h M src/gsup_server.c 2 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/89/38989/1
diff --git a/include/osmocom/hlr/gsup_server.h b/include/osmocom/hlr/gsup_server.h index 86ae4ec..5767dec 100644 --- a/include/osmocom/hlr/gsup_server.h +++ b/include/osmocom/hlr/gsup_server.h @@ -2,9 +2,9 @@
#include <osmocom/core/linuxlist.h> #include <osmocom/core/msgb.h> -#include <osmocom/abis/ipa.h> -#include <osmocom/abis/ipaccess.h> #include <osmocom/gsm/gsup.h> +#include <osmocom/gsm/protocol/ipaccess.h> +#include <osmocom/abis/ipa.h> #include <osmocom/gsupclient/cni_peer_id.h> #include <osmocom/gsupclient/gsup_req.h>
diff --git a/src/gsup_server.c b/src/gsup_server.c index 1510bd0..2df2d3d 100644 --- a/src/gsup_server.c +++ b/src/gsup_server.c @@ -24,12 +24,12 @@ #include <osmocom/core/msgb.h> #include <osmocom/core/logging.h> #include <osmocom/core/linuxlist.h> -#include <osmocom/abis/ipa.h> -#include <osmocom/abis/ipaccess.h> -#include <osmocom/gsm/ipa.h> #include <osmocom/gsm/gsm48_ie.h> #include <osmocom/gsm/apn.h> +#include <osmocom/gsm/protocol/ipaccess.h> +#include <osmocom/gsm/ipa.h> #include <osmocom/gsm/gsm23003.h> +#include <osmocom/abis/ipa.h>
#include <osmocom/hlr/gsup_server.h> #include <osmocom/hlr/gsup_router.h>
-
pespin