[Bf-blender-cvs] [93d0a2c] master: Warnings

[Campbell Barton]

Commit: 93d0a2c2244637cbd02381241e4ea075106b0044
Author: Campbell Barton
Date:   Mon Jul 28 20:41:37 2014 +1000
Branches: master
https://developer.blender.org/rB93d0a2c2244637cbd02381241e4ea075106b0044

Warnings

===================================================================

M	source/blender/blenkernel/intern/pbvh.c
M	source/blender/blenlib/intern/BLI_kdopbvh.c
M	source/blender/makesrna/intern/rna_internal.h

===================================================================

diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 7bdce4e..ccedb6f 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -51,10 +51,12 @@
 #define STACK_FIXED_DEPTH   100
 
 /* Setting zero so we can catch bugs in OpenMP/PBVH. */
-#ifdef DEBUG
-#  define PBVH_OMP_LIMIT 0
-#else
-#  define PBVH_OMP_LIMIT 8
+#ifdef _OPENMP
+#  ifdef DEBUG
+#    define PBVH_OMP_LIMIT 0
+#  else
+#    define PBVH_OMP_LIMIT 8
+#  endif
 #endif
 
 typedef struct PBVHStack {
diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c
index 7b7463c..17ab55e 100644
--- a/source/blender/blenlib/intern/BLI_kdopbvh.c
+++ b/source/blender/blenlib/intern/BLI_kdopbvh.c
@@ -48,10 +48,12 @@
 /* Setting zero so we can catch bugs in OpenMP/KDOPBVH.
  * TODO(sergey): Deduplicate the limits with PBVH from BKE.
  */
-#ifdef DEBUG
-#  define KDOPBVH_OMP_LIMIT 0
-#else
-#  define KDOPBVH_OMP_LIMIT 1024
+#ifdef _OPENMP
+#  ifdef DEBUG
+#    define KDOPBVH_OMP_LIMIT 0
+#  else
+#    define KDOPBVH_OMP_LIMIT 1024
+#  endif
 #endif
 
 typedef unsigned char axis_t;
@@ -759,7 +761,7 @@ static void non_recursive_bvh_div_nodes(BVHTree *tree, BVHNode *branches_array,
 
 		/* Loop all branches on this level */
 
-//#pragma omp parallel for private(j) schedule(static) if (num_leafs > KDOPBVH_OMP_LIMIT)
+#pragma omp parallel for private(j) schedule(static) if (num_leafs > KDOPBVH_OMP_LIMIT)
 		for (j = i; j < end_j; j++) {
 			int k;
 			const int parent_level_index = j - i;
@@ -1112,7 +1114,7 @@ BVHTreeOverlap *BLI_bvhtree_overlap(BVHTree *tree1, BVHTree *tree2, unsigned int
 		data[j]->stop_axis  = min_axis(tree1->stop_axis,  tree2->stop_axis);
 	}
 
-//#pragma omp parallel for private(j) schedule(static)  if (tree1->totleaf > KDOPBVH_OMP_LIMIT)
+#pragma omp parallel for private(j) schedule(static)  if (tree1->totleaf > KDOPBVH_OMP_LIMIT)
 	for (j = 0; j < MIN2(tree1->tree_type, tree1->nodes[tree1->totleaf]->totnode); j++) {
 		traverse(data[j], tree1->nodes[tree1->totleaf]->children[j], tree2->nodes[tree2->totleaf]);
 	}
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h
index bec6aff..8ec6999 100644
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@ -414,7 +414,7 @@ void rna_RenderPass_rect_set(PointerRNA *ptr, const float *values);
 #endif
 
 /* C11 for compile time range checks */
-#if __STDC_VERSION__ >= 201112L
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
 #  define USE_RNA_RANGE_CHECK
 #  define TYPEOF_MAX(x) \
 	_Generic(x, \