Commit f3611c27 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

changed u_int16_t to unsigned short because it is the only place within ares... 

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.
parent d5de8495

ares/Makefile.vc6

+1 −1
Original line number Diff line number Diff line
@@ -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

ares/ares.h

+3 −3
Original line number Diff line number Diff line
@@ -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;

};

ares/ares_parse_srv_reply.3

+3 −3
Original line number Diff line number Diff line
@@ -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

ares/ares_parse_srv_reply.c

+6 −6
Original line number Diff line number Diff line
@@ -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)