diff: use hwloc_uint64_t instead of uint64_t

This commit was SVN r5808.

diff --git a/include/hwloc/diff.h b/include/hwloc/diff.h
index 6751cf8c31c6c6465b119099ebfd7019bc37236c..59f7296576fdc612caeefa284b3f056b73b59235 100644 (file)
--- a/include/hwloc/diff.h
+++ b/include/hwloc/diff.h
@@ -81,9 +81,9 @@ union hwloc_topology_diff_obj_attr_u {
   struct hwloc_topology_diff_obj_attr_uint64_s {
     /* used for storing integer attributes */
     hwloc_topology_diff_obj_attr_type_t type;
-    uint64_t index; /* not used for SIZE */
-    uint64_t oldvalue;
-    uint64_t newvalue;
+    hwloc_uint64_t index; /* not used for SIZE */
+    hwloc_uint64_t oldvalue;
+    hwloc_uint64_t newvalue;
   } uint64;
 
   /** \brief String attribute modification with an optional name */

diff --git a/src/diff.c b/src/diff.c
index 5e327ca994bd9f32656ecd978dab90e0fd647cdb..e076118e8401ef944df06320d5411655b4839410 100644 (file)
--- a/src/diff.c
+++ b/src/diff.c
@@ -97,9 +97,9 @@ static int hwloc_append_diff_obj_attr_string(hwloc_obj_t obj,
 
 static int hwloc_append_diff_obj_attr_uint64(hwloc_obj_t obj,
                                             hwloc_topology_diff_obj_attr_type_t type,
-                                            uint64_t index,
-                                            uint64_t oldvalue,
-                                            uint64_t newvalue,
+                                            hwloc_uint64_t index,
+                                            hwloc_uint64_t oldvalue,
+                                            hwloc_uint64_t newvalue,
                                             hwloc_topology_diff_t *firstdiffp,
                                             hwloc_topology_diff_t *lastdiffp)
 {
@@ -314,9 +314,9 @@ hwloc_apply_diff_one(hwloc_topology_t topology,
                switch (obj_attr->diff.generic.type) {
                case HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_SIZE: {
                        hwloc_obj_t tmpobj;
-                       uint64_t oldvalue = reverse ? obj_attr->diff.uint64.newvalue : obj_attr->diff.uint64.oldvalue;
-                       uint64_t newvalue = reverse ? obj_attr->diff.uint64.oldvalue : obj_attr->diff.uint64.newvalue;
-                       uint64_t valuediff = newvalue - oldvalue;
+                       hwloc_uint64_t oldvalue = reverse ? obj_attr->diff.uint64.newvalue : obj_attr->diff.uint64.oldvalue;
+                       hwloc_uint64_t newvalue = reverse ? obj_attr->diff.uint64.oldvalue : obj_attr->diff.uint64.newvalue;
+                       hwloc_uint64_t valuediff = newvalue - oldvalue;
                        if (obj->memory.local_memory != oldvalue)
                                return -1;
                        obj->memory.local_memory = newvalue;