soc-2008-mxcurioni: added Aldrik Dunbar's patch for 64bit Linux builds

2 files changed, 3 insertions, 1 deletions

diff --git a/source/blender/freestyle/intern/geometry/FitCurve.cpp b/source/blender/freestyle/intern/geometry/FitCurve.cpp
index ade40b050ca..7754fcda32b 100755
--- a/source/blender/freestyle/intern/geometry/FitCurve.cpp
+++ b/source/blender/freestyle/intern/geometry/FitCurve.cpp
@@ -19,6 +19,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include <cstdlib> // for malloc and free
 #include <stdio.h>
 #include <math.h>
 #include "FitCurve.h"
diff --git a/source/blender/freestyle/intern/geometry/Grid.h b/source/blender/freestyle/intern/geometry/Grid.h
index fdca13d4ca4..e54b7b4d381 100755
--- a/source/blender/freestyle/intern/geometry/Grid.h
+++ b/source/blender/freestyle/intern/geometry/Grid.h
@@ -31,6 +31,7 @@
 #ifndef  GRID_H
 # define GRID_H
 
+# include <cstring> // for memset
 # include <float.h>
 # include <vector>
 # include "../system/FreestyleConfig.h"
@@ -325,7 +326,7 @@ public:
           for (OccludersSet::iterator it = occluders.begin();
               it != occluders.end();
               it++) {
-                  if ((unsigned)(*it)->userdata2 != _timestamp) {
+                  if ((unsigned long)(*it)->userdata2 != _timestamp) {
                       (*it)->userdata2 = (void*)_timestamp;
                       visitor.examineOccluder(*it);
                   }