[Bf-blender-cvs] [4b9fb83] master: Appease grumpy ole gcc 4.7 of MinGW64 (possibly gcc 4.6 of MinGW32 too?) that cannot convert float to char without false warnings that are turned into errors with strict flags. I expect that any real conversion warnings can be caught on linux.

Antony Riakiotakis noreply at git.blender.org
Fri Dec 6 00:34:52 CET 2013


Commit: 4b9fb83e674e36acf7d241e60367a2b9d8821a1c
Author: Antony Riakiotakis
Date:   Thu Dec 5 23:32:30 2013 +0200
http://developer.blender.org/rB4b9fb83e674e36acf7d241e60367a2b9d8821a1c

Appease grumpy ole gcc 4.7 of MinGW64 (possibly gcc 4.6 of MinGW32 too?)
that cannot convert float to char without false warnings that are turned
into errors with strict flags. I expect that any real conversion
warnings can be caught on linux.

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

M	source/blender/blenlib/intern/math_color.c

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

diff --git a/source/blender/blenlib/intern/math_color.c b/source/blender/blenlib/intern/math_color.c
index f57ae96..4c1620f 100644
--- a/source/blender/blenlib/intern/math_color.c
+++ b/source/blender/blenlib/intern/math_color.c
@@ -35,7 +35,9 @@
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
 
+#ifndef __MINGW32__
 #include "BLI_strict_flags.h"
+#endif
 
 void hsv_to_rgb(float h, float s, float v, float *r, float *g, float *b)
 {




More information about the Bf-blender-cvs mailing list