Janitor - fix offsetof macro to not generate "cast from pointer to int of different...

diff --git a/lib/agraph/aghdr.h b/lib/agraph/aghdr.h
index 11b90a38b7873e2d3950d768f4ad9228cf697572..5d352814b6d4a1448318f481f8a9ada6cdcc7e2a 100644 (file)
--- a/lib/agraph/aghdr.h
+++ b/lib/agraph/aghdr.h
@@ -51,6 +51,12 @@ extern "C" {
 # ifdef HAVE_UNISTD_H
 #  include             <unistd.h>
 # endif                                /* HAVE_UNISTD_H */
+# ifdef HAVE_STDINT_H
+#  include <stdint.h>
+# endif
+# ifdef HAVE_INTTYPES_H
+#  include <inttypes.h>
+# endif
 #endif                         /* HAVE_AST */
 
 #ifdef DEBUG
@@ -65,7 +71,11 @@ extern "C" {
 #ifdef offsetof
 #undef offsetof
 #endif
+#ifdef HAVE_INTPTR_T
+#define offsetof(typ,fld)  ((intptr_t)(&(((typ*)0)->fld)))
+#else
 #define offsetof(typ,fld)  ((int)(&(((typ*)0)->fld)))
+#endif
 #define NOTUSED(var)   (void) var
 
 #define NILgraph                       NIL(Agraph_t*)

diff --git a/lib/agraph/attr.c b/lib/agraph/attr.c
index d171d340711e668f218b653a904dc36a38b5af58..05fc22ce643d4e0932f87a601d1d2bb651ac3425 100644 (file)
--- a/lib/agraph/attr.c
+++ b/lib/agraph/attr.c
@@ -28,9 +28,9 @@
 static void freesym(Dict_t * d, Void_t * obj, Dtdisc_t * disc);
 
 Dtdisc_t AgDataDictDisc = {
-    (int) offsetof(Agsym_t, name),     /* use symbol name as key */
+    offsetof(Agsym_t, name),   /* use symbol name as key */
     -1,
-    (int) offsetof(Agsym_t, link),
+    offsetof(Agsym_t, link),
     NIL(Dtmake_f),
     freesym,
     NIL(Dtcompar_f),