fix visualstudio build 3

Author: ndenoyelle

hwloc/distrib.c

@@ -5,33 +5,31 @@
  * See COPYING in top-level directory.
 ****************************************************************************/
 
+#include <time.h>
+#include <stdlib.h>
 #include "private/autogen/config.h"
 #include "hwloc.h"
 
-#ifdef HWLOC_WIN_SYS
-#include <windows.h>
-#endif
-
 struct hwloc_distrib_level{
 	hwloc_obj_type_t type; // level type.
 	unsigned depth; // level depth.
-	size_t user_index; // Index of this level as provided by user order.
-	size_t arity; // Number of children of this level below parent.
-	size_t coord; // The current level object index [0..arity[.
+        unsigned user_index; // Index of this level as provided by user order.
+        unsigned arity; // Number of children of this level below parent.
+	unsigned coord; // The current level object index [0..arity[.
 	// Iteration order of this level objects. index[coord] give logical_index below parent.
-	size_t *index;
+	unsigned *index;
 };
 
 struct hwloc_distrib_iterator{
         hwloc_obj_t *roots;
-        size_t n_roots;
-	size_t root_coord;
+        unsigned n_roots;
+	unsigned root_coord;
 	struct hwloc_distrib_level ** levels; // n_roots * n_levels
-	size_t n_levels;
+	unsigned n_levels;
 };
 
-static size_t* range(const size_t n){
-	size_t i,*r = malloc(n*sizeof(*r));
+static unsigned* range(const unsigned n){
+	unsigned i,*r = malloc(n*sizeof(*r));
 
 	if(r==NULL)
 		return NULL;
@@ -40,17 +38,17 @@ static size_t* range(const size_t n){
 	return r;
 }
 
-static size_t* reversed_range(const size_t n){
-	size_t i,*r = malloc(n*sizeof(*r));
+static unsigned* reversed_range(const unsigned n){
+	unsigned i,*r = malloc(n*sizeof(*r));
 
 	if(r==NULL)
 		return NULL;
 	for(i=0; i<n; i++){ r[i] = n-i-1; }
 	return r;
 }
 
-static size_t* shuffled_range(const size_t n){
-	size_t i, *index, *ret, val;
+static unsigned* shuffled_range(const unsigned n){
+	unsigned i, *index, *ret, val;
 
 	if ((index = range(n)) == NULL)
 		return NULL;
@@ -95,10 +93,10 @@ static struct hwloc_distrib_level *
 hwloc_distrib_root_levels(hwloc_topology_t topology,
 			  const hwloc_obj_t root,
 			  const hwloc_obj_type_t *types,
-			  const size_t n_types,
+			  const unsigned n_types,
 			  const unsigned long flags)
 {
-	size_t i;
+	unsigned i;
 	struct hwloc_distrib_level *levels = malloc(n_types * sizeof(*levels));
 	if(levels == NULL)
 		return NULL;
@@ -124,7 +122,7 @@ hwloc_distrib_root_levels(hwloc_topology_t topology,
 	      hwloc_distrib_level_cmp_depth);	
 
 	// Walk from top to bottom and set arity to the maximum arity below root field.
-	size_t arity;
+        unsigned arity;
 	hwloc_obj_t parent=root;
 
 	for (i=0; i<n_types; i++){
@@ -184,11 +182,11 @@ static void hwloc_distrib_destroy_level(struct hwloc_distrib_level *levels){
 struct hwloc_distrib_iterator *
 hwloc_distrib_build_iterator(hwloc_topology_t topology,
 			     hwloc_obj_t *roots,
-			     const size_t n_roots,
+			     const unsigned n_roots,
 			     const hwloc_obj_type_t *levels,
-			     const size_t n_levels,
+			     const unsigned n_levels,
 			     const unsigned long flags){
-	size_t i;
+	unsigned i;
 	struct hwloc_distrib_iterator *it = malloc(sizeof(*it) +
 						   sizeof(*it->levels) * n_roots);
 	if(it == NULL)
@@ -245,7 +243,7 @@ hwloc_distrib_iterator_scatter(hwloc_topology_t topology,
 			       const hwloc_obj_type_t type,
 			       const unsigned long flags){
 
-	size_t i=0, n=0;
+	unsigned i=0, n=0;
 	hwloc_obj_t obj, root = hwloc_get_obj_by_depth(topology, 0, 0);
 
 	// Count depths with a non empty cpuset. 
@@ -297,7 +295,7 @@ hwloc_distrib_iterator_scatter(hwloc_topology_t topology,
 }
 
 void hwloc_distrib_destroy_iterator(struct hwloc_distrib_iterator *it){
-	size_t i;
+	unsigned i;
 
 	for(i=0; i<it->n_roots; i++)
 		hwloc_distrib_destroy_level(it->levels[i]);
@@ -340,10 +338,10 @@ int
 hwloc_distrib_iterator_next(hwloc_topology_t topology,
 			    struct hwloc_distrib_iterator *it,
 			    hwloc_obj_t *next){
-	size_t i;
+	unsigned i;
         struct hwloc_distrib_level *levels = it->levels[it->root_coord];
 	hwloc_obj_t obj = it->roots[it->root_coord];
-	size_t coord;
+	unsigned coord;
 
 	// Sort by depth to walk objects at set coordinates.
 	qsort(levels,