*** empty log message ***

diff --git a/lib/kernel_Environment/ConceptInstantHandler.h b/lib/kernel_Environment/ConceptInstantHandler.h
index b71baba1f357f524b10a09614149fdaa211d16bd..47e9f74b6cfa5eb3118c7e7262b60ca215e43cd4 100644 (file)
--- a/lib/kernel_Environment/ConceptInstantHandler.h
+++ b/lib/kernel_Environment/ConceptInstantHandler.h
@@ -3,8 +3,8 @@
   Program:  ConceptInstantHandler
   Module:    $RCSfile: ConceptInstantHandler.h,v $
   Language:  C++
-  Date:      $Date: 2008/11/04 16:33:55 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2008/11/04 16:56:49 $
+  Version:   $Revision: 1.5 $
   Objective: Wrapper fo the concepts that subscribe to the instant handler
   Authot:      Monica Maria Lozano Romero
 
@@ -44,17 +44,15 @@
 #ifndef __CONCEPTINSTANTHANDLER_H_INCLUDED__
 #define __CONCEPTINSTANTHANDLER_H_INCLUDED__
 
-#if defined(WIN32)
-       //If we're using a dynamic library
-       # ifdef CreaEnvironment_BUILD_SHARED
-       #   define CreaEnvironment_EXPORTS __declspec( dllexport )
-       # else
-       #   define CreaEnvironment_EXPORTS //__declspec( dllimport )
-       # endif //maracasvisulib_EXPORTS
-#else
-       #ifndef CreaEnvironment_EXPORTS
-               #define CreaEnvironment_EXPORTS
+
+#if defined(_WIN32) 
+       #ifdef CreaEnvironment_BUILD_SHARED
+               #define CreaEnvironment_EXPORTS __declspec( dllexport )
+       #else
+               #define CreaEnvironment_EXPORTS 
        #endif
+#else
+       #define CreaEnvironment_EXPORTS
 #endif
 
 

diff --git a/lib/kernel_Environment/Instant.cxx b/lib/kernel_Environment/Instant.cxx
index 6629a0066d71fae5b3d6a51e5a04f5fa2cd1de81..465b791b2b2c6497070a2c9275af9ccc2dc29291 100644 (file)
--- a/lib/kernel_Environment/Instant.cxx
+++ b/lib/kernel_Environment/Instant.cxx
@@ -8,6 +8,7 @@
 #include <vector>
 
 // LOCAL INCLUDES
+#include "ConceptInstantHandler.h"
 #include "Instant.h"
 
 // FORWARD REFERENCES

diff --git a/lib/kernel_Environment/Instant.h b/lib/kernel_Environment/Instant.h
index 7af2a4dadf721cd09d6885607b2f0c085999f422..8a98b238f456d05f8c8e80add44f125668f40647 100644 (file)
--- a/lib/kernel_Environment/Instant.h
+++ b/lib/kernel_Environment/Instant.h
@@ -21,7 +21,7 @@
 #ifndef __INSTANT_H_INCLUDED__
 #define  __INSTANT_H_INCLUDED__
 
-#include "ConceptInstantHandler.h"
+//#include "ConceptInstantHandler.h"
 
 class CreaEnvironment_EXPORTS Instant
        {