From 091393e79ce1f2042c6f8febd70232dbcf3da95e Mon Sep 17 00:00:00 2001
From: Gunter Knauf <gk@gknw.de>
Date: Sat, 5 Sep 2009 15:12:30 +0000
Subject: [PATCH] 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.

---
 Makefile.vc6           |  2 +-
 ares.h                 |  6 +++---
 ares_parse_srv_reply.3 |  6 +++---
 ares_parse_srv_reply.c | 12 ++++++------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Makefile.vc6 b/Makefile.vc6
index 0c31bd92..871efa33 100644
--- a/Makefile.vc6
+++ b/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.h b/ares.h
index bfca7dae..ad7c4d57 100644
--- a/ares.h
+++ b/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_parse_srv_reply.3 b/ares_parse_srv_reply.3
index 8f3edf4f..a83d480a 100644
--- a/ares_parse_srv_reply.3
+++ b/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_parse_srv_reply.c b/ares_parse_srv_reply.c
index 61f0be1e..5b1e218d 100644
--- a/ares_parse_srv_reply.c
+++ b/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)