Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-04-10 13:37:04 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-04-10 13:37:04 +0400
commit1c6956a4d6b15ddca3588f1838d3b9903e7239af (patch)
treec8aee4e95b584f4c6f5a46a8a44d1ebcd491ab6b /source/blender/render/intern/raytrace
parent2d677efb3b52814d5b96f1aa496d75083187b3fe (diff)
quiet msvc/mingw compiler warnings.
Diffstat (limited to 'source/blender/render/intern/raytrace')
-rw-r--r--source/blender/render/intern/raytrace/reorganize.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/render/intern/raytrace/reorganize.h b/source/blender/render/intern/raytrace/reorganize.h
index 09df74fefed..856df6ba320 100644
--- a/source/blender/render/intern/raytrace/reorganize.h
+++ b/source/blender/render/intern/raytrace/reorganize.h
@@ -43,7 +43,10 @@
#include "BKE_global.h"
#ifdef _WIN32
-#define INFINITY FLT_MAX // in mingw math.h: (1.0F/0.0F). This generates compile error, though.
+# ifdef INFINITY
+# undef INFINITY
+# endif
+# define INFINITY FLT_MAX // in mingw math.h: (1.0F/0.0F). This generates compile error, though.
#endif
extern int tot_pushup;