[Mevislabmodules-svn] SF.net SVN: mevislabmodules:[357] trunk/UMD/METK/Sources/Inventor

[<wol...@us...>]

Revision: 357
          http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=357&view=rev
Author:   wolfspindler
Date:     2011-06-08 16:11:47 +0000 (Wed, 08 Jun 2011)

Log Message:
-----------
Trial to fix platform incompatibility for required malloc.h.

Modified Paths:
--------------
    trunk/UMD/METK/Sources/Inventor/UMDSoMeasurement/UMDMainAxis.cpp
    trunk/UMD/METK/Sources/Inventor/UMDVisLogo/SoVisLogo.cpp

Modified: trunk/UMD/METK/Sources/Inventor/UMDSoMeasurement/UMDMainAxis.cpp
===================================================================
--- trunk/UMD/METK/Sources/Inventor/UMDSoMeasurement/UMDMainAxis.cpp	2011-06-08 15:48:25 UTC (rev 356)
+++ trunk/UMD/METK/Sources/Inventor/UMDSoMeasurement/UMDMainAxis.cpp	2011-06-08 16:11:47 UTC (rev 357)
@@ -6,9 +6,10 @@
 
 #include "UMDMainAxis.h"
 #include <stdlib.h>
+#ifndef __APPLE__
 #include <malloc.h>
+#endif
 
-
 #define JACOBI_ROTATE(a,i,j,k,l) g=a[i][j];\
   h=a[k][l];\
   a[i][j]=g-s*(h+g*tau);\

Modified: trunk/UMD/METK/Sources/Inventor/UMDVisLogo/SoVisLogo.cpp
===================================================================
--- trunk/UMD/METK/Sources/Inventor/UMDVisLogo/SoVisLogo.cpp	2011-06-08 15:48:25 UTC (rev 356)
+++ trunk/UMD/METK/Sources/Inventor/UMDVisLogo/SoVisLogo.cpp	2011-06-08 16:11:47 UTC (rev 357)
@@ -28,7 +28,9 @@
 #include <GL/glew.h>
 #pragma warning( disable : 4611 )
 #include "png.h"
+#ifndef __APPLE__
 #include <malloc.h>
+#endif
 
 SO_NODE_SOURCE(SoVisLogo)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.