diff options
author | Daniel Veillard <veillard@redhat.com> | 2012-04-02 15:45:13 +0800 |
---|---|---|
committer | Daniel Veillard <veillard@redhat.com> | 2012-04-02 15:45:13 +0800 |
commit | ac17e5939c032e547cf5a6325223ff5eb08e04b1 (patch) | |
tree | eded2190ba8ce5f1a5aa1fd69cb4e90866a16945 | |
parent | bdc64d6d5f5f30982279af23cfa2d3ab08ba34c4 (diff) | |
download | libxml2-ac17e5939c032e547cf5a6325223ff5eb08e04b1.tar.gz |
Remove two references to u_short
-rw-r--r-- | nanoftp.c | 3 | ||||
-rw-r--r-- | nanohttp.c | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -947,7 +947,8 @@ xmlNanoFTPConnect(void *ctx) { ((struct sockaddr_in *)&ctxt->ftpAddr)->sin_family = AF_INET; memcpy (&((struct sockaddr_in *)&ctxt->ftpAddr)->sin_addr, hp->h_addr_list[0], hp->h_length); - ((struct sockaddr_in *)&ctxt->ftpAddr)->sin_port = (u_short)htons ((unsigned short)port); + ((struct sockaddr_in *)&ctxt->ftpAddr)->sin_port = + (unsigned short)htons ((unsigned short)port); ctxt->controlFd = socket (AF_INET, SOCK_STREAM, 0); addrlen = sizeof (struct sockaddr_in); } @@ -1166,7 +1166,7 @@ xmlNanoHTTPConnectHost(const char *host, int port) memcpy (&ia, h->h_addr_list[i], h->h_length); sockin.sin_family = h->h_addrtype; sockin.sin_addr = ia; - sockin.sin_port = (u_short)htons ((unsigned short)port); + sockin.sin_port = (unsigned short)htons ((unsigned short)port); addr = (struct sockaddr *) &sockin; #ifdef SUPPORT_IP6 } else if (have_ipv6 () && (h->h_addrtype == AF_INET6)) { |