Revision: 27634
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27634
Author: nexyon
Date: 2010-03-21 00:36:08 +0100 (Sun, 21 Mar 2010)
Log Message:
-----------
Finally, this should really fix the msvc and old ubuntu compiler problems with
NAN and finite.
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/BLI_math_base.h
trunk/blender/source/blender/editors/screen/screen_ops.c
Modified: trunk/blender/source/blender/blenlib/BLI_math_base.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_math_base.h 2010-03-20
23:31:48 UTC (rev 27633)
+++ trunk/blender/source/blender/blenlib/BLI_math_base.h 2010-03-20
23:36:08 UTC (rev 27634)
@@ -70,8 +70,8 @@
#define M_LN10 2.30258509299404568402
#endif
#ifndef NAN
-static __const char __qnan__[8] = { 0, 0, 0, 0, 0, 0, 0xf8, 0x7f };
-#define NAN (*(__const double *) __qnan__)
+static const unsigned long __qnan__ = 0x7fc00000UL;
+#define NAN ((const float) __qnan__)
#endif
#ifndef sqrtf
@@ -124,7 +124,6 @@
#ifndef FREE_WINDOWS
#define isnan(n) _isnan(n)
#define finite _finite
-#define isfinite(n) _finite(n)
#endif
#endif
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2010-03-20
23:31:48 UTC (rev 27633)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2010-03-20
23:36:08 UTC (rev 27634)
@@ -2411,7 +2411,7 @@
if((scene->audio.flag & AUDIO_SYNC) && !(sad->flag &
ANIMPLAY_FLAG_REVERSE))
time = sound_sync_scene(scene);
- if(isfinite(time))
+ if(finite(time))
scene->r.cfra = floor(time * FPS);
else
{
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
