X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Fkernel%2FmarTypes.h;h=93bee0a9b455c31a5e1d9513c4bc66273c1ebd1a;hb=8185e042f64574ca43bba733ec2158a2aa994220;hp=60a06f9e6bb4fa8bb86b53be4c9258191e1e14e0;hpb=4970ac35d6d4bc3cea54e8e6033b34c01c3103fb;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/kernel/marTypes.h b/lib/maracasVisuLib/src/kernel/marTypes.h
index 60a06f9..93bee0a 100644
--- a/lib/maracasVisuLib/src/kernel/marTypes.h
+++ b/lib/maracasVisuLib/src/kernel/marTypes.h
@@ -3,14 +3,14 @@
   Program:   wxMaracas
   Module:    $RCSfile: marTypes.h,v $
   Language:  C++
-  Date:      $Date: 2008/11/25 15:59:44 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2010/11/03 19:44:45 $
+  Version:   $Revision: 1.9 $
 
   Copyright: (c) 2002, 2003
   License:
-  
-     This software is distributed WITHOUT ANY WARRANTY; without even 
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
@@ -30,9 +30,9 @@
  *  this fairy tale :-).
  */
 
-
 //JHCL - Start
 //If we're using windows
+/*
 #if defined(WIN32)
 	//If we're using a dynamic library
 	#ifdef creaMaracasVisu_BUILD_SHARED
@@ -41,8 +41,11 @@
 		#define MARACASVISULIB_EXPORTS __declspec( dllimport )
 	#endif //maracasvisulib_EXPORTS
 #else
-	#define MARACASVISULIB_EXPORTS 
+	#define MARACASVISULIB_EXPORTS
 #endif
+	*/
+// LG 15/01/09 : Now use crea mechanism
+#include "creaMaracasVisu_EXPORT.h"
 //JHCL - End
 
 
@@ -79,15 +82,16 @@
  *
  *  This file is included by all project files.
  */
+
+#include "creaSystem.h"
+
+// This redefinitions shoul be useless using uint8_t, etc  // JPR
+
 typedef unsigned char  uchar;  /*!< unsigned char redefintion. */
 typedef unsigned int   uint;   /*!< unsigned int redefintion. */
 typedef unsigned long  ulong;  /*!< unsigned long redefintion. */
 typedef unsigned short ushort; /*!< unsigned short redefintion. */
 
-// Is this compilation using LibIDO?
-
-//#define KGFO_USE_IDO  // JPRx : Do NOT use LibIDO
-
 // Is this compilation using VTK?
 #define KGFO_USE_VTK