fix visualstudio build

Author: ndenoyelle

hwloc/distrib.c

@@ -31,21 +31,21 @@ struct hwloc_distrib_iterator{
 };
 
 static size_t* range(const size_t n){
-	size_t* r = malloc(n*sizeof(*r));
+	size_t* i,r = malloc(n*sizeof(*r));
 
 	if(r==NULL)
 		return NULL;
-	for(size_t i=0; i<n; i++)
+	for(i=0; i<n; i++)
 		r[i] = i;
 	return r;
 }
 
 static size_t* reversed_range(const size_t n){
-	size_t* r = malloc(n*sizeof(*r));
+	size_t* i,r = malloc(n*sizeof(*r));
 
 	if(r==NULL)
 		return NULL;
-	for(size_t i=0; i<n; i++){ r[i] = n-i-1; }
+	for(i=0; i<n; i++){ r[i] = n-i-1; }
 	return r;
 }
 
@@ -98,11 +98,12 @@ hwloc_distrib_root_levels(hwloc_topology_t topology,
 			  const size_t n_types,
 			  const unsigned long flags)
 {
+	size_t i;
 	struct hwloc_distrib_level *levels = malloc(n_types * sizeof(*levels));
 	if(levels == NULL)
 		return NULL;
 
-	for (size_t i=0; i<n_types; i++){
+	for (i=0; i<n_types; i++){
 		levels[i].type = types[i];
 		levels[i].depth = hwloc_get_type_depth(topology, types[i]);
 		if (levels[i].depth < 0 ){
@@ -125,7 +126,8 @@ hwloc_distrib_root_levels(hwloc_topology_t topology,
 	// Walk from top to bottom and set arity to the maximum arity below root field.
 	size_t arity;
 	hwloc_obj_t parent=root;
-	for (size_t i=0; i<n_types; i++){
+	
+	for (i=0; i<n_types; i++){
 		while (parent) {
 			arity = hwloc_get_nbobjs_inside_cpuset_by_depth(topology,
 								        parent->cpuset,
@@ -150,7 +152,7 @@ hwloc_distrib_root_levels(hwloc_topology_t topology,
 	}
 
 	// Allocate levels index.
-	for (size_t i=0; i<n_types; i++){
+	for (i=0; i<n_types; i++){
 		if (flags & HWLOC_DISTRIB_FLAG_SHUFFLE) {
 			levels[i].index = shuffled_range(levels[i].arity);
 		}
@@ -186,7 +188,7 @@ hwloc_distrib_build_iterator(hwloc_topology_t topology,
 			     const hwloc_obj_type_t *levels,
 			     const size_t n_levels,
 			     const unsigned long flags){
-	
+	size_t i;
 	struct hwloc_distrib_iterator *it = malloc(sizeof(*it) +
 						   sizeof(*it->levels) * n_roots);
 	if(it == NULL)
@@ -198,7 +200,7 @@ hwloc_distrib_build_iterator(hwloc_topology_t topology,
 	it->n_levels = n_levels;
 	it->levels = (struct hwloc_distrib_level **)((char*)it + sizeof(*it));
 
-	for(size_t i=0; i<n_roots; i++){
+	for(i=0; i<n_roots; i++){
 		it->levels[i] = hwloc_distrib_root_levels(topology, roots[i], levels, n_levels, flags);
 		if(it->levels[i] == NULL){
 			while(i--){ hwloc_distrib_destroy_level(it->levels[i]); }
@@ -245,9 +247,9 @@ hwloc_distrib_iterator_scatter(hwloc_topology_t topology,
 
 	size_t i=0, n=0;
 	hwloc_obj_t obj, root = hwloc_get_obj_by_depth(topology, 0, 0);
-	obj = root;
-
+	
 	// Count depths with a non empty cpuset. 
+	obj = root;
 	while(obj){
 		if ((obj->cpuset != NULL && !hwloc_bitmap_iszero(obj->cpuset)) &&
 		    hwloc_get_type_depth(topology, obj->type) >= 0)
@@ -256,10 +258,11 @@ hwloc_distrib_iterator_scatter(hwloc_topology_t topology,
 			break;
 		obj = obj->first_child;
 	}
-
-	obj = root;
+	
 	hwloc_obj_type_t levels[n];
+
 	// fill levels array.
+	obj = root;
 	while(obj){
 		if( obj->cpuset != NULL && !hwloc_bitmap_iszero(obj->cpuset) &&
 		    hwloc_get_type_depth(topology, obj->type) >= 0){
@@ -274,6 +277,7 @@ hwloc_distrib_iterator_scatter(hwloc_topology_t topology,
 	struct hwloc_distrib_iterator *it = malloc(sizeof(*it) +
 						   sizeof(hwloc_obj_t) + 
 						   sizeof(struct hwloc_distrib_level*));
+	
 	if(it == NULL)
 		return NULL;
 
@@ -293,7 +297,9 @@ hwloc_distrib_iterator_scatter(hwloc_topology_t topology,
 }
 
 void hwloc_distrib_destroy_iterator(struct hwloc_distrib_iterator *it){
-	for(size_t i=0; i<it->n_roots; i++)
+	size_t i;
+	
+	for(i=0; i<it->n_roots; i++)
 		hwloc_distrib_destroy_level(it->levels[i]);
 	free(it);
 }
@@ -334,6 +340,7 @@ int
 hwloc_distrib_iterator_next(hwloc_topology_t topology,
 			    struct hwloc_distrib_iterator *it,
 			    hwloc_obj_t *next){
+	size_t i;
         struct hwloc_distrib_level *levels = it->levels[it->root_coord];
 	hwloc_obj_t obj = it->roots[it->root_coord];
 	size_t coord;
@@ -344,7 +351,7 @@ hwloc_distrib_iterator_next(hwloc_topology_t topology,
 	      sizeof(*levels),
 	      hwloc_distrib_level_cmp_depth);	
 
-	for(size_t i=0; i<it->n_levels; i++){
+	for(i=0; i<it->n_levels; i++){
 		coord = levels[i].index[levels[i].coord];
 		obj = hwloc_get_obj_inside_cpuset_by_depth(topology,
 							   obj->cpuset,