[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46068] trunk/blender/intern/cycles/util/ util_types.h: mingw32 compiles again

Joshua Leung aligorith at gmail.com
Sun Apr 29 15:00:00 CEST 2012


Revision: 46068
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46068
Author:   aligorith
Date:     2012-04-29 13:00:00 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
mingw32 compiles again

"__force_inline" keyword used in Cycles header is not defined

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-04-29 12:33:56 UTC (rev 46067)
+++ trunk/blender/intern/cycles/util/util_types.h	2012-04-29 13:00:00 UTC (rev 46068)
@@ -36,7 +36,7 @@
 #define __shared
 #define __constant
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(FREE_WINDOWS)
 #define __device_inline static __forceinline
 #define __align(...) __declspec(align(__VA_ARGS__))
 #else




More information about the Bf-blender-cvs mailing list