[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52722] trunk/blender/intern/cycles/util/ util_types.h: get rid of annoying redefinition warning on cycles compilation for mingw64

[Antony Riakiotakis]

Revision: 52722
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52722
Author:   psy-fi
Date:     2012-12-02 20:08:11 +0000 (Sun, 02 Dec 2012)
Log Message:
-----------
get rid of annoying redefinition warning on cycles compilation for mingw64

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

Modified: trunk/blender/intern/cycles/util/util_types.h
===================================================================
--- trunk/blender/intern/cycles/util/util_types.h	2012-12-02 19:20:19 UTC (rev 52721)
+++ trunk/blender/intern/cycles/util/util_types.h	2012-12-02 20:08:11 UTC (rev 52722)
@@ -41,7 +41,9 @@
 #define __align(...) __declspec(align(__VA_ARGS__))
 #else
 #define __device_inline static inline __attribute__((always_inline))
+#ifndef FREE_WINDOWS64
 #define __forceinline inline __attribute__((always_inline))
+#endif
 #define __align(...) __attribute__((aligned(__VA_ARGS__)))
 #endif