Permalink
Browse files

compiler warning: fix

Fix compiler warning: conversion may lose significant bits
  • Loading branch information...
1 parent 5ef8f5e commit f413fce8233c4e6f2e89bed177a9de42b3718d1e @yangtse yangtse committed May 26, 2011
Showing with 27 additions and 1 deletion.
  1. +1 −0 ares_getnameinfo.c
  2. +17 −1 ares_nowarn.c
  3. +8 −0 ares_nowarn.h
  4. +1 −0 ares_platform.c
View
@@ -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 {
View
@@ -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__ */
View
@@ -33,13 +33,21 @@ 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))
# undef FD_SET
# 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__ */
View
@@ -20,6 +20,7 @@
#include "ares.h"
#include "ares_platform.h"
+#include "ares_nowarn.h"
#include "ares_private.h"
#if defined(WIN32) && !defined(MSDOS)

0 comments on commit f413fce

Please sign in to comment.