From e2c1520a712b529bacd6198e7725543ad8be0165 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 23 Jul 2010 19:09:21 +0800 Subject: [PATCH] nat: u_int16_t -> uint16_t --- openbsc/src/nat/bsc_mgcp_utils.c | 4 ++-- openbsc/tests/bsc-nat/bsc_nat_test.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openbsc/src/nat/bsc_mgcp_utils.c b/openbsc/src/nat/bsc_mgcp_utils.c index 48be904cf..32d988e1d 100644 --- a/openbsc/src/nat/bsc_mgcp_utils.c +++ b/openbsc/src/nat/bsc_mgcp_utils.c @@ -41,7 +41,7 @@ int bsc_mgcp_assign(struct sccp_connections *con, struct msgb *msg) { struct sccp_connections *mcon; struct tlv_parsed tp; - u_int16_t cic; + uint16_t cic; uint8_t timeslot; uint8_t multiplex; int combined; @@ -62,7 +62,7 @@ int bsc_mgcp_assign(struct sccp_connections *con, struct msgb *msg) return -1; } - cic = ntohs(*(u_int16_t *)TLVP_VAL(&tp, GSM0808_IE_CIRCUIT_IDENTITY_CODE)); + cic = ntohs(*(uint16_t *)TLVP_VAL(&tp, GSM0808_IE_CIRCUIT_IDENTITY_CODE)); timeslot = cic & 0x1f; multiplex = (cic & ~0x1f) >> 5; diff --git a/openbsc/tests/bsc-nat/bsc_nat_test.c b/openbsc/tests/bsc-nat/bsc_nat_test.c index e39ec0c3c..6771b314e 100644 --- a/openbsc/tests/bsc-nat/bsc_nat_test.c +++ b/openbsc/tests/bsc-nat/bsc_nat_test.c @@ -132,7 +132,7 @@ static const uint8_t pag_resp[] = { struct filter_result { const uint8_t *data; - const u_int16_t length; + const uint16_t length; const int dir; const int result; };