Merge remote branch 'origin/hydro/imps_2015'

[modules/gui.git] / src / OCCViewer / OCCViewer.h

diff --git a/src/OCCViewer/OCCViewer.h b/src/OCCViewer/OCCViewer.h
index 6f2948d8e7cbd43aeaba905b15324ff5c17d680f..c2201c1e00cad0ce04137bf05ec7987545748bef 100755 (executable)
--- a/src/OCCViewer/OCCViewer.h
+++ b/src/OCCViewer/OCCViewer.h
@@ -1,26 +1,30 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  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, or (at your option) any later version.
 //
-//  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
 //
+
+#ifndef OCCVIEWER_H
+#define OCCVIEWER_H
+
 #ifdef WIN32
-#ifdef OCCVIEWER_EXPORTS
+#if defined OCCVIEWER_EXPORTS || defined OCCViewer_EXPORTS
 #define OCCVIEWER_EXPORT __declspec(dllexport)
 #else
 #define OCCVIEWER_EXPORT __declspec(dllimport)
@@ -32,3 +36,5 @@
 #if defined WIN32
 #pragma warning ( disable: 4251 )
 #endif
+
+#endif //OCCVIEWER_H