[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26091] trunk/blender/source/blender/ blenkernel: Fix compile on msvc (inline)

[Matt Ebb]

Revision: 26091
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26091
Author:   broken
Date:     2010-01-19 03:15:37 +0100 (Tue, 19 Jan 2010)

Log Message:
-----------
Fix compile on msvc (inline)

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_colortools.h
    trunk/blender/source/blender/blenkernel/intern/colortools.c

Modified: trunk/blender/source/blender/blenkernel/BKE_colortools.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_colortools.h	2010-01-19 01:32:06 UTC (rev 26090)
+++ trunk/blender/source/blender/blenkernel/BKE_colortools.h	2010-01-19 02:15:37 UTC (rev 26091)
@@ -35,6 +35,16 @@
 struct ImBuf;
 struct rctf;
 
+#if defined _WIN32
+#   define DO_INLINE __inline
+#elif defined (__sgi)
+#   define DO_INLINE
+#elif defined (__sun) || defined (__sun__)
+#   define DO_INLINE
+#else
+#   define DO_INLINE static inline
+#endif
+
 typedef enum CurveMappingPreset {
 	CURVE_PRESET_LINE,
 	CURVE_PRESET_SHARP,

Modified: trunk/blender/source/blender/blenkernel/intern/colortools.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/colortools.c	2010-01-19 01:32:06 UTC (rev 26090)
+++ trunk/blender/source/blender/blenkernel/intern/colortools.c	2010-01-19 02:15:37 UTC (rev 26091)
@@ -880,7 +880,7 @@
 
 /* ***************** Histogram **************** */
 
-static inline int get_bin_float(float f)
+DO_INLINE int get_bin_float(float f)
 {
 	CLAMP(f, 0.0, 1.0);