diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-10-06 07:40:50 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-10-06 07:40:50 +0400 |
| commit | 1c940d7677ceca15976b69b8bab1aede6ad6d4aa (patch) | |
| tree | 4e67991fc8b2f8b2513a339ad39d10ad2a38737e /source/blender/render/intern/include/rayobject.h | |
| parent | 3fe274b072df205614da150df9c3743f2b1b422a (diff) | |
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...
Diffstat (limited to 'source/blender/render/intern/include/rayobject.h')
| -rw-r--r-- | source/blender/render/intern/include/rayobject.h | 6 |
1 files changed, 3 insertions, 3 deletions
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 <stdio.h> #include <float.h> @@ -174,11 +175,10 @@ int RE_rayobjectcontrol_test_break(RayObjectControl *c); -#if !defined(_WIN32) +#if !defined(_WIN32) && !defined(_WIN64) #include <sys/time.h> #include <time.h> -#include <stdio.h> #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 |