fix visualstudio build

Author: ndenoyelle

hwloc/distrib.c

@@ -8,6 +8,10 @@
 #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.
@@ -29,48 +33,61 @@ struct hwloc_distrib_iterator{
 static size_t* range(const size_t n){
 	size_t* r = malloc(n*sizeof(*r));
 
-	if(r==NULL) return NULL;
-	for(size_t i=0; i<n; i++){ r[i] = i; }
+	if(r==NULL)
+		return NULL;
+	for(size_t 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));
 
-	if(r==NULL) return NULL;
+	if(r==NULL)
+		return NULL;
 	for(size_t 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;
 
-	if ((index = range(n)) == NULL) return NULL;
-	if ((ret = malloc(n*sizeof(*ret))) == NULL) { free(index); return NULL; }
+	if ((index = range(n)) == NULL)
+		return NULL;
+
+	ret = malloc(n*sizeof(*ret));
+	if (ret == NULL) {
+		free(index);
+		return NULL;
+	}
 
 	srand(time(NULL));  
 	for(i=n;i>0;i--){
 		val = rand()%(i);
 		ret[i-1] = index[val];
 		index[val] = index[i-1];
-  }
-  free(index);
-  return ret;
+	}
+	free(index);
+	return ret;
 }
 
 static int hwloc_distrib_level_cmp_depth(const void *la, const void* lb){
 	const struct hwloc_distrib_level *a = (struct hwloc_distrib_level *)la;	
 	const struct hwloc_distrib_level *b = (struct hwloc_distrib_level *)lb;
-	if(a->depth > b->depth) { return 1; }
-	if(a->depth < b->depth) { return -1; }
+	if(a->depth > b->depth)
+		return 1;
+	if(a->depth < b->depth)
+		return -1;
 	return 0;
 }
 
 static int hwloc_distrib_level_cmp_user_index(const void *la, const void* lb){
 	const struct hwloc_distrib_level *a = (struct hwloc_distrib_level *)la;	
 	const struct hwloc_distrib_level *b = (struct hwloc_distrib_level *)lb;
-	if(a->user_index > b->user_index) { return 1; }
-	if(a->user_index < b->user_index) { return -1; }
+	if(a->user_index > b->user_index)
+		return 1;
+	if(a->user_index < b->user_index)
+		return -1;
 	return 0;
 }
 
@@ -172,7 +189,8 @@ hwloc_distrib_build_iterator(hwloc_topology_t topology,
 
 	struct hwloc_distrib_iterator *it = malloc(sizeof(*it) +
 						   sizeof(*it->levels) * n_roots);
-	if(it == NULL) return NULL;
+	if(it == NULL)
+		return NULL;
 
 	it->roots = roots;
 	it->n_roots = n_roots;
@@ -203,7 +221,8 @@ hwloc_distrib_iterator_round_robin(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;
+	if(it == NULL)
+		return NULL;
 
 	it->roots = (hwloc_obj_t*) ((char*)it + sizeof(*it));
 	*it->roots = root;	
@@ -255,7 +274,8 @@ 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;
+	if(it == NULL)
+		return NULL;
 
 	it->roots = (hwloc_obj_t*) ((char*)it + sizeof(*it));
 	*it->roots = root;