Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/render/intern/include/rayobject.h')
-rw-r--r--source/blender/render/intern/include/rayobject.h6
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