From 1c940d7677ceca15976b69b8bab1aede6ad6d4aa Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Tue, 6 Oct 2009 03:40:50 +0000 Subject: Attempts at some compile fixes for jaguarandi's code: * mingw almost compiles again cleanly, except for a linking error when linking blender http://www.pasteall.org/8297 * win64 should compile again too to a similar degree? * silenced warnings about no newlines... --- source/blender/render/intern/include/rayobject.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/render/intern/include') diff --git a/source/blender/render/intern/include/rayobject.h b/source/blender/render/intern/include/rayobject.h index 9e35c0feac5..5579f3896c1 100644 --- a/source/blender/render/intern/include/rayobject.h +++ b/source/blender/render/intern/include/rayobject.h @@ -35,6 +35,7 @@ extern "C" { #include "RE_raytrace.h" #include "render_types.h" +#include #include @@ -174,11 +175,10 @@ int RE_rayobjectcontrol_test_break(RayObjectControl *c); -#if !defined(_WIN32) +#if !defined(_WIN32) && !defined(_WIN64) #include #include -#include #define BENCH(a,name) \ do { \ @@ -194,7 +194,7 @@ int RE_rayobjectcontrol_test_break(RayObjectControl *c); } while(0) #else -#define BENCH(a) (a) +#define BENCH(a,name) (a) #endif -- cgit v1.2.3