[Bf-blender-cvs] [58ec292] master: Fix cycles build error with visual studio, apparently the windows ABI does not like 16 bit alignment on 32 bit.

[Brecht Van Lommel]

Commit: 58ec292fd82a168ac4901163c525325b6e28ae70
Author: Brecht Van Lommel
Date:   Sat Nov 23 05:24:26 2013 +0100
http://developer.blender.org/rB58ec292fd82a168ac4901163c525325b6e28ae70

Fix cycles build error with visual studio, apparently the windows ABI does not
like 16 bit alignment on 32 bit.

===================================================================

M	intern/cycles/util/util_types.h

===================================================================

diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h
index fe74322..3fa1df6 100644
--- a/intern/cycles/util/util_types.h
+++ b/intern/cycles/util/util_types.h
@@ -23,6 +23,12 @@
 
 #endif
 
+/* Bitness */
+
+#if defined(__ppc64__) || defined(__PPC64__) || defined(__x86_64__) || defined(__ia64__) || defined(_M_X64)
+#define __KERNEL_64_BIT__
+#endif
+
 /* Qualifiers for kernel code shared by CPU and GPU */
 
 #ifndef __KERNEL_GPU__
@@ -34,7 +40,11 @@
 
 #if defined(_WIN32) && !defined(FREE_WINDOWS)
 #define ccl_device_inline static __forceinline
+#ifdef __KERNEL_64_BIT__
 #define ccl_align(...) __declspec(align(__VA_ARGS__))
+#else
+#define ccl_align(...) /* not support for function arguments (error C2719) */
+#endif
 #define ccl_may_alias
 #else
 #define ccl_device_inline static inline __attribute__((always_inline))
@@ -47,12 +57,6 @@
 
 #endif
 
-/* Bitness */
-
-#if defined(__ppc64__) || defined(__PPC64__) || defined(__x86_64__) || defined(__ia64__) || defined(_M_X64)
-#define __KERNEL_64_BIT__
-#endif
-
 /* SIMD Types */
 
 #ifndef __KERNEL_GPU__