Update from BR_V5_DEV 13Feb2009

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

diff --git a/src/STD/STD.h b/src/STD/STD.h
index caeee3b3fa21a3976ba25bfc1568140c24a7e58d..6569cff7fb96dc1b0ccacfcc4316ee87d4d614c1 100755 (executable)
--- a/src/STD/STD.h
+++ b/src/STD/STD.h
@@ -1,36 +1,35 @@
-// Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
-// 
-// 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.
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// 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
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  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.
+//
+//  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
 //
 #ifndef STD_H
 #define STD_H
 
-#if defined STD_EXPORTS
-#if defined WNT
-#define STD_EXPORT             __declspec( dllexport )
+#if defined WIN32
+#  if defined STD_EXPORTS
+#    define STD_EXPORT  __declspec( dllexport )
+#  else
+#    define STD_EXPORT  __declspec( dllimport )
+#  endif
 #else
-#define STD_EXPORT
-#endif
-#else
-#if defined WNT
-#define STD_EXPORT             __declspec( dllimport )
-#else
-#define STD_EXPORT
-#endif
+#  define STD_EXPORT
 #endif
 
 #if defined SOLARIS
@@ -39,7 +38,7 @@
 #define true  1
 #endif
 
-#if defined WNT
+#if defined WIN32
 #pragma warning ( disable: 4251 )
 #endif