[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45536] trunk/blender/intern/cycles/util/ util_math.h: Fix cycles opencl compile issue, fminf/fmaxf() was defined both as macro and function.

[Brecht Van Lommel]

Revision: 45536
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45536
Author:   blendix
Date:     2012-04-11 09:07:28 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
Fix cycles opencl compile issue, fminf/fmaxf() was defined both as macro and function.

Modified Paths:
--------------
    trunk/blender/intern/cycles/util/util_math.h

Modified: trunk/blender/intern/cycles/util/util_math.h
===================================================================
--- trunk/blender/intern/cycles/util/util_math.h	2012-04-11 08:57:54 UTC (rev 45535)
+++ trunk/blender/intern/cycles/util/util_math.h	2012-04-11 09:07:28 UTC (rev 45536)
@@ -38,6 +38,8 @@
 
 CCL_NAMESPACE_BEGIN
 
+/* Float Pi variations */
+
 #ifndef M_PI_F
 #define M_PI_F		((float)3.14159265358979323846264338327950288)
 #endif
@@ -69,6 +71,8 @@
 
 #endif
 
+#ifndef __KERNEL_OPENCL__
+
 __device_inline float fmaxf(float a, float b)
 {
 	return (a > b)? a: b;
@@ -81,6 +85,8 @@
 
 #endif
 
+#endif
+
 #ifndef __KERNEL_GPU__
 
 __device_inline int max(int a, int b)