Merge from branch mpa/qwt6_porting

[modules/smesh.git] / src / SMESHDS / SMESH_Controls.hxx

diff --git a/src/SMESHDS/SMESH_Controls.hxx b/src/SMESHDS/SMESH_Controls.hxx
index 49d6ab1d24e639468d091f7c980ea803ec6747e6..bd7871ac7c6de506aa1c246b938919153183ba29 100644 (file)
--- a/src/SMESHDS/SMESH_Controls.hxx
+++ b/src/SMESHDS/SMESH_Controls.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2013  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
@@ -23,11 +23,14 @@
 #ifndef _SMESH_CONTROLS_HXX_
 #define _SMESH_CONTROLS_HXX_
 
+// This file is named incosistently with others, i.e. not SMESHDS_Controls.hxx,
+// because it was moved from ../Controls/SMESH_Controls.hxx
+
 #include "SMDSAbs_ElementType.hxx"
 
 #include <boost/shared_ptr.hpp>
 
-#ifdef WNT
+#ifdef WIN32
  #if defined SMESHCONTROLS_EXPORTS || defined SMESHControls_EXPORTS
   #define SMESHCONTROLS_EXPORT __declspec( dllexport )
  #else