summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2010-02-21 19:59:09 +0000
committerYang Tse <yangsita@gmail.com>2010-02-21 19:59:09 +0000
commit157d68729f5ff4c9eb2f0d5d1fbf8d09cda4b378 (patch)
treeb981cf1abda5502b58e29551197b92161ff8fe24
parentd2f21d37b150ada1bc861a35a01d901d0dc536e0 (diff)
downloadc-ares-157d68729f5ff4c9eb2f0d5d1fbf8d09cda4b378.tar.gz
c-ares-157d68729f5ff4c9eb2f0d5d1fbf8d09cda4b378.tar.bz2
c-ares-157d68729f5ff4c9eb2f0d5d1fbf8d09cda4b378.zip
fix compiler warning
-rw-r--r--ares_data.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/ares_data.c b/ares_data.c
index 16a5cc50..ee76018 100644
--- a/ares_data.c
+++ b/ares_data.c
@@ -45,8 +45,18 @@ void ares_free_data(void *dataptr)
if (!dataptr)
return;
+#ifdef __INTEL_COMPILER
+# pragma warning(push)
+# pragma warning(disable:1684)
+ /* 1684: conversion from pointer to same-sized integral type */
+#endif
+
ptr = (void *)((char *)dataptr - offsetof(struct ares_data, data));
+#ifdef __INTEL_COMPILER
+# pragma warning(pop)
+#endif
+
if (ptr->mark != ARES_DATATYPE_MARK)
return;
@@ -134,8 +144,18 @@ ares_datatype ares_get_datatype(void * dataptr)
{
struct ares_data *ptr;
+#ifdef __INTEL_COMPILER
+# pragma warning(push)
+# pragma warning(disable:1684)
+ /* 1684: conversion from pointer to same-sized integral type */
+#endif
+
ptr = (void *)((char *)dataptr - offsetof(struct ares_data, data));
+#ifdef __INTEL_COMPILER
+# pragma warning(pop)
+#endif
+
if (ptr->mark == ARES_DATATYPE_MARK)
return ptr->type;