X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Fkernel%2FmarTypes.h;h=93bee0a9b455c31a5e1d9513c4bc66273c1ebd1a;hb=a3bf4fd2420496a16c98c8490101f54d25eeb7d3;hp=d119451a5bffeb7d7f23db9dd1dd30c8b590b2c2;hpb=440530af88d75f48ca2a77cfd3904c5d376e69a3;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/kernel/marTypes.h b/lib/maracasVisuLib/src/kernel/marTypes.h
index d119451..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/05 15:27:03 $
-  Version:   $Revision: 1.2 $
+  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.
 
 =========================================================================*/
@@ -31,23 +31,27 @@
  */
 
 //JHCL - Start
-//If we're using windws
+//If we're using windows
+/*
 #if defined(WIN32)
-//If we're using a dynamic library
-# ifdef maracasVisuLib_BUILD_SHARED
-#   define MARACASVISULIB_EXPORTS __declspec( dllexport )
-# else
-#   define MARACASVISULIB_EXPORTS //__declspec( dllimport )
-# endif //maracasvisulib_EXPORTS
+	//If we're using a dynamic library
+	#ifdef creaMaracasVisu_BUILD_SHARED
+		#define MARACASVISULIB_EXPORTS __declspec( dllexport )
+	#else
+		#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
 
+
+/*
 #if defined(WIN32) //&& defined(MARACAS_BUILD_SHARED_LIBS)
-//guerapa0
 # ifdef MaracasKernel_EXPORTS
-//querapa1
 #   define MAR_KERNEL_EXPORT __declspec( dllexport )
 # else
 #   define MAR_KERNEL_EXPORT //__declspec( dllimport )
@@ -65,6 +69,8 @@
 # define MAR_INTERFACEWX_EXPORT
 
 #endif //WIN32
+*/
+
 // Other ridiculous constants and typedefs. Just for fun!
 #define MAR_DEFAULT_FILE_PARAMETERS      "params.dat"
 #define MAR_DEFAULT_FILE_DICTIONARY      "marDict.txt"
@@ -76,14 +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
-
 // Is this compilation using VTK?
 #define KGFO_USE_VTK