[Bf-blender-cvs] [53297e6] master: Fixed warning about redefining the __SSE__ macro in VS2013

Sybren A. Stüvel noreply at git.blender.org
Wed Nov 5 17:56:24 CET 2014


Commit: 53297e62eb603e61a0033ad2a7d571a258202087
Author: Sybren A. Stüvel
Date:   Wed Nov 5 17:09:27 2014 +0100
Branches: master
https://developer.blender.org/rB53297e62eb603e61a0033ad2a7d571a258202087

Fixed warning about redefining the __SSE__ macro in VS2013

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

M	extern/clew/include/clew.h

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

diff --git a/extern/clew/include/clew.h b/extern/clew/include/clew.h
index f4a50dd..328fd52 100644
--- a/extern/clew/include/clew.h
+++ b/extern/clew/include/clew.h
@@ -350,7 +350,7 @@ typedef unsigned int cl_GLenum;
 
 #ifdef _MSC_VER
 #if defined(_M_IX86)
-#if _M_IX86_FP >= 0
+#if _M_IX86_FP >= 0 && !defined(__SSE__)
 #define __SSE__
 #endif
 #if _M_IX86_FP >= 1




More information about the Bf-blender-cvs mailing list