compiler warning: fix

Fix compiler warning: conversion may lose significant bits
pull/6/head
Yang Tse 14 years ago
parent 5ef8f5ead2
commit f413fce823
  1. 1
      ares_getnameinfo.c
  2. 18
      ares_nowarn.c
  3. 8
      ares_nowarn.h
  4. 1
      ares_platform.c

@ -58,6 +58,7 @@
#include "ares.h"
#include "ares_ipv6.h"
#include "inet_ntop.h"
#include "ares_nowarn.h"
#include "ares_private.h"
struct nameinfo_query {

@ -1,5 +1,5 @@
/* Copyright (C) 2010 by Daniel Stenberg
/* Copyright (C) 2010-2011 by Daniel Stenberg
*
* Permission to use, copy, modify, and distribute this
* software and its documentation for any purpose and without
@ -140,4 +140,20 @@ void aresx_FD_ZERO(fd_set *fdset)
#pragma warning(pop)
}
unsigned short aresx_htons(unsigned short usnum)
{
#pragma warning(push)
#pragma warning(disable:810) /* conversion may lose significant bits */
return htons(usnum);
#pragma warning(pop)
}
unsigned short aresx_ntohs(unsigned short usnum)
{
#pragma warning(push)
#pragma warning(disable:810) /* conversion may lose significant bits */
return ntohs(usnum);
#pragma warning(pop)
}
#endif /* __INTEL_COMPILER && __unix__ */

@ -33,6 +33,10 @@ void aresx_FD_SET(int fd, fd_set *fdset);
void aresx_FD_ZERO(fd_set *fdset);
unsigned short aresx_htons(unsigned short usnum);
unsigned short aresx_ntohs(unsigned short usnum);
#ifndef BUILDING_ARES_NOWARN_C
# undef FD_ISSET
# define FD_ISSET(a,b) aresx_FD_ISSET((a),(b))
@ -40,6 +44,10 @@ void aresx_FD_ZERO(fd_set *fdset);
# define FD_SET(a,b) aresx_FD_SET((a),(b))
# undef FD_ZERO
# define FD_ZERO(a) aresx_FD_ZERO((a))
# undef htons
# define htons(a) aresx_htons((a))
# undef ntohs
# define ntohs(a) aresx_ntohs((a))
#endif
#endif /* __INTEL_COMPILER && __unix__ */

@ -20,6 +20,7 @@
#include "ares.h"
#include "ares_platform.h"
#include "ares_nowarn.h"
#include "ares_private.h"
#if defined(WIN32) && !defined(MSDOS)

Loading…
Cancel
Save