aboutsummaryrefslogtreecommitdiff
path: root/ares
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
commit10affed097df354f1b9db8602cd7257f76d10654 (patch)
tree4768a11da103dd44055cfdc3d6bbd0818694b180 /ares
parent25a49ccd2137c8e26f70c12d18e597f4c7677015 (diff)
fix compiler warning
Diffstat (limited to 'ares')
-rw-r--r--ares/ares_data.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/ares/ares_data.c b/ares/ares_data.c
index 16a5cc507..ee7601856 100644
--- a/ares/ares_data.c
+++ b/ares/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;