diff options
| author | Gunter Knauf <gk@gknw.de> | 2009-09-05 15:12:30 +0000 |
|---|---|---|
| committer | Gunter Knauf <gk@gknw.de> | 2009-09-05 15:12:30 +0000 |
| commit | f3611c2773c95128166e1fd84726a2f3da50629b (patch) | |
| tree | 94dc27a08602d355384ad87616eadbe8f730800e /ares | |
| parent | d5de8495523f63f79c6013da009c759ca063edfa (diff) | |
changed u_int16_t to unsigned short because it is the only place within ares and curl where such a type would be used;
also it broke many autobuilds. We should probably introduce an ares_port_t if we want to use a type here.
Diffstat (limited to 'ares')
| -rw-r--r-- | ares/Makefile.vc6 | 2 | ||||
| -rw-r--r-- | ares/ares.h | 6 | ||||
| -rw-r--r-- | ares/ares_parse_srv_reply.3 | 6 | ||||
| -rw-r--r-- | ares/ares_parse_srv_reply.c | 12 |
4 files changed, 13 insertions, 13 deletions
diff --git a/ares/Makefile.vc6 b/ares/Makefile.vc6 index 0c31bd92c..871efa33e 100644 --- a/ares/Makefile.vc6 +++ b/ares/Makefile.vc6 @@ -19,7 +19,7 @@ USE_WATT32 = 0 CC = cl -CFLAGS = -nologo -$(CFG_MODEL)$(DEBUG_MODEL) -W3 -Yd -Zi -Du_int16_t=u_short +CFLAGS = -nologo -$(CFG_MODEL)$(DEBUG_MODEL) -W3 -Yd -Zi LDFLAGS = -machine:i386 -map OBJ_DIR = VC6_obj diff --git a/ares/ares.h b/ares/ares.h index bfca7dae1..ad7c4d57a 100644 --- a/ares/ares.h +++ b/ares/ares.h @@ -323,9 +323,9 @@ struct addr6ttl { }; struct srv_reply { - u_int16_t weight; - u_int16_t priority; - u_int16_t port; + unsigned short weight; + unsigned short priority; + unsigned short port; char *host; }; diff --git a/ares/ares_parse_srv_reply.3 b/ares/ares_parse_srv_reply.3 index 8f3edf4f4..a83d480a3 100644 --- a/ares/ares_parse_srv_reply.3 +++ b/ares/ares_parse_srv_reply.3 @@ -49,9 +49,9 @@ contains the following fields: .in +4n .nf struct srv_reply { - u_int16_t weight; - u_int16_t priority; - u_int16_t port; + unsigned short weight; + unsigned short priority; + unsigned short port; char *host; }; .fi diff --git a/ares/ares_parse_srv_reply.c b/ares/ares_parse_srv_reply.c index 61f0be1ea..5b1e218d4 100644 --- a/ares/ares_parse_srv_reply.c +++ b/ares/ares_parse_srv_reply.c @@ -120,12 +120,12 @@ ares_parse_srv_reply (const unsigned char *abuf, int alen, break; } - srv[i].priority = ntohs (*((u_int16_t *)aptr)); - aptr += sizeof(u_int16_t); - srv[i].weight = ntohs (*((u_int16_t *)aptr)); - aptr += sizeof(u_int16_t); - srv[i].port = ntohs (*((u_int16_t *)aptr)); - aptr += sizeof(u_int16_t); + srv[i].priority = ntohs (*((unsigned short *)aptr)); + aptr += sizeof(unsigned short); + srv[i].weight = ntohs (*((unsigned short *)aptr)); + aptr += sizeof(unsigned short); + srv[i].port = ntohs (*((unsigned short *)aptr)); + aptr += sizeof(unsigned short); status = ares_expand_name (aptr, abuf, alen, &srv[i].host, &len); if (status != ARES_SUCCESS) |