Merge from V6_main_20120808 08Aug12

[modules/smesh.git] / src / StdMeshers / SMESH_StdMeshers.hxx

diff --git a/src/StdMeshers/SMESH_StdMeshers.hxx b/src/StdMeshers/SMESH_StdMeshers.hxx
index be440c1bd35ad57acc7e8528da10e51ac55fffbd..50e53acddd7c2023bbf6152f568a6d7a5bda4461 100755 (executable)
--- a/src/StdMeshers/SMESH_StdMeshers.hxx
+++ b/src/StdMeshers/SMESH_StdMeshers.hxx
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  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
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

 //
 //

-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.

 //
 //

-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.

 //
 //

-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA

 //
 //

-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com

 //
 //

+

 //  File   : SMESH_StdMeshers.hxx
 //  Author : Alexander BORODIN
 //  Module : SMESH
 //  File   : SMESH_StdMeshers.hxx
 //  Author : Alexander BORODIN
 //  Module : SMESH


@@ -28,7 +29,7 @@
 #define _SMESH_StdMeshers_HXX_
 
 #ifdef WNT
 #define _SMESH_StdMeshers_HXX_
 
 #ifdef WNT

- #if defined STDMESHERS_EXPORTS
+ #if defined STDMESHERS_EXPORTS || defined StdMeshers_EXPORTS

   #define STDMESHERS_EXPORT __declspec( dllexport )
  #else
   #define STDMESHERS_EXPORT __declspec( dllimport )
   #define STDMESHERS_EXPORT __declspec( dllexport )
  #else
   #define STDMESHERS_EXPORT __declspec( dllimport )