From 1c940d7677ceca15976b69b8bab1aede6ad6d4aa Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
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 +++---
 source/blender/render/intern/raytrace/rayobject_qbvh.cpp | 2 +-
 source/blender/render/intern/raytrace/svbvh.h            | 2 +-
 source/blender/render/intern/raytrace/vbvh.h             | 2 +-
 source/blender/render/intern/source/rayshade.c           | 1 +
 5 files changed, 7 insertions(+), 6 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
 
diff --git a/source/blender/render/intern/raytrace/rayobject_qbvh.cpp b/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
index 8d35848c9ec..2719675e3b8 100644
--- a/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
+++ b/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
@@ -146,4 +146,4 @@ RayObject *RE_rayobject_qbvh_create(int size)
 	return NULL;
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/source/blender/render/intern/raytrace/svbvh.h b/source/blender/render/intern/raytrace/svbvh.h
index 3c733b6b402..5837d51d3d4 100644
--- a/source/blender/render/intern/raytrace/svbvh.h
+++ b/source/blender/render/intern/raytrace/svbvh.h
@@ -246,4 +246,4 @@ struct Reorganize_SVBVH
 
 #endif
 
-#endif //__SSE__
\ No newline at end of file
+#endif //__SSE__
diff --git a/source/blender/render/intern/raytrace/vbvh.h b/source/blender/render/intern/raytrace/vbvh.h
index 1ff51786e52..7d3dbffd125 100644
--- a/source/blender/render/intern/raytrace/vbvh.h
+++ b/source/blender/render/intern/raytrace/vbvh.h
@@ -234,4 +234,4 @@ struct Reorganize_VBVH
 		return node;
 	}	
 };
-*/
\ No newline at end of file
+*/
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c
index f2d61e01f50..08d1785446f 100644
--- a/source/blender/render/intern/source/rayshade.c
+++ b/source/blender/render/intern/source/rayshade.c
@@ -25,6 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <stdio.h>
 #include <math.h>
 #include <string.h>
 #include <stdlib.h>
-- 
cgit v1.2.3