[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14379] trunk/blender/source/blender/ blenkernel/BKE_cloth.h: Partial commit of patch #8812 ( fixing inlining on sunOS)

[Daniel Genrich]

Revision: 14379
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14379
Author:   genscher
Date:     2008-04-10 18:36:46 +0200 (Thu, 10 Apr 2008)

Log Message:
-----------
Partial commit of patch #8812 (fixing inlining on sunOS)

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_cloth.h

Modified: trunk/blender/source/blender/blenkernel/BKE_cloth.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_cloth.h 2008-04-10 13:20:36 UTC 
(rev 14378)
+++ trunk/blender/source/blender/blenkernel/BKE_cloth.h 2008-04-10 16:36:46 UTC 
(rev 14379)
@@ -60,16 +60,16 @@
 struct CollisionTree;
 
 // this is needed for inlining behaviour
-#ifndef _WIN32
-#define LINUX
-#ifndef __sgi
-#define DO_INLINE inline
+#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  
+#   define DO_INLINE inline
+#   define LINUX
 #endif
-#else
-#define DO_INLINE __inline
-#endif
 
 #define CLOTH_MAX_THREAD 2
 


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs