aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2010-07-31 04:38:17 +0800
committerHolger Hans Peter Freyther <zecke@selfish.org>2010-07-31 04:38:17 +0800
commit585f3d90d17745418e162b26e76f92d6c36cf3a0 (patch)
treea29d6763fae57a058703639c16156464b36bf5b0 /src
parent5aa17014deace6d91a5cbb9784a9c05521ba19c8 (diff)
u_int16_t -> uint16_t
Diffstat (limited to 'src')
-rw-r--r--src/mgcp/mgcp_network.c2
-rw-r--r--src/openbsc_nat/tlv_parser.c4
-rw-r--r--src/pcap.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/mgcp/mgcp_network.c b/src/mgcp/mgcp_network.c
index 3a8381d..4951088 100644
--- a/src/mgcp/mgcp_network.c
+++ b/src/mgcp/mgcp_network.c
@@ -58,7 +58,7 @@ struct rtp_hdr {
uint8_t marker:1,
payload_type:7;
#endif
- u_int16_t sequence;
+ uint16_t sequence;
u_int32_t timestamp;
u_int32_t ssrc;
} __attribute__((packed));
diff --git a/src/openbsc_nat/tlv_parser.c b/src/openbsc_nat/tlv_parser.c
index 9255fed..9b38b9f 100644
--- a/src/openbsc_nat/tlv_parser.c
+++ b/src/openbsc_nat/tlv_parser.c
@@ -28,7 +28,7 @@ int tlv_dump(struct tlv_parsed *dec)
*
* Also, returns the number of bytes consumed by the TLV entry
*/
-int tlv_parse_one(uint8_t *o_tag, u_int16_t *o_len, const uint8_t **o_val,
+int tlv_parse_one(uint8_t *o_tag, uint16_t *o_len, const uint8_t **o_val,
const struct tlv_definition *def,
const uint8_t *buf, int buf_len)
{
@@ -107,7 +107,7 @@ int tlv_parse(struct tlv_parsed *dec, const struct tlv_definition *def,
uint8_t lv_tag2)
{
int ofs = 0, num_parsed = 0;
- u_int16_t len;
+ uint16_t len;
memset(dec, 0, sizeof(*dec));
diff --git a/src/pcap.c b/src/pcap.c
index de6f77c..ac29dee 100644
--- a/src/pcap.c
+++ b/src/pcap.c
@@ -34,8 +34,8 @@
*/
struct pcap_hdr {
u_int32_t magic_number;
- u_int16_t version_major;
- u_int16_t version_minor;
+ uint16_t version_major;
+ uint16_t version_minor;
int32_t thiszone;
u_int32_t sigfigs;
u_int32_t snaplen;