Merge from V5_1_main branch 24/11/2010

[modules/geom.git] / src / GEOMClient / GEOM_Client.hxx

diff --git a/src/GEOMClient/GEOM_Client.hxx b/src/GEOMClient/GEOM_Client.hxx
index ba7a9ef6d94e3b9ee6391b580c6e171ed7af057f..f5f9cafc2727aa3d774da36ad0397d85375ee57d 100644 (file)
--- a/src/GEOMClient/GEOM_Client.hxx
+++ b/src/GEOMClient/GEOM_Client.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  GEOM GEOMClient : tool to transfer BREP files from GEOM server to GEOM client
 //  File   : GEOM_Client.hxx
 //  Author : Yves FRICAUD
@@ -31,6 +32,9 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(GEOM_Gen)
 #
+#ifdef HAVE_FINITE
+#undef HAVE_FINITE // E.A. fix a warning about redefinition of HAVE_FINITE in re-inclusion of Standard_values.h
+#endif
 #ifndef _TColStd_SequenceOfAsciiString_HeaderFile
 #include <TColStd_SequenceOfAsciiString.hxx>
 #endif
@@ -52,7 +56,7 @@ class TopoDS_Shape;
 #endif
 
 #ifdef WNT
- #if defined GEOMCLIENT_EXPORTS
+ #if defined GEOMCLIENT_EXPORTS || defined GEOMClient_EXPORTS
   #if defined WIN32
    #define GEOMCLIENT_EXPORT __declspec( dllexport )
   #else