X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FCAM%2FCAM.h;h=7d55083cdb125c575d58b5ebd95d00a75e290abb;hb=da0829dff07ea351cd385c493e2f63bf15640234;hp=b953c9927be718401521753c6fc95a9a268c319a;hpb=399155730966dfc225fbb24f66204b05664385f2;p=modules%2Fgui.git diff --git a/src/CAM/CAM.h b/src/CAM/CAM.h index b953c9927..7d55083cd 100755 --- a/src/CAM/CAM.h +++ b/src/CAM/CAM.h @@ -1,36 +1,36 @@ -// Copyright (C) 2005 OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D -// +// Copyright (C) 2007-2016 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 +// // 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 +// 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. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software +// 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 CAM_H #define CAM_H -#if defined CAM_EXPORTS -#if defined WNT -#define CAM_EXPORT __declspec( dllexport ) +#if defined WIN32 +# if defined CAM_EXPORTS +# define CAM_EXPORT __declspec( dllexport ) +# else +# define CAM_EXPORT __declspec( dllimport ) +# endif #else -#define CAM_EXPORT -#endif -#else -#if defined WNT -#define CAM_EXPORT __declspec( dllimport ) -#else -#define CAM_EXPORT -#endif +# define CAM_EXPORT #endif #if defined SOLARIS @@ -39,7 +39,7 @@ #define true 1 #endif -#if defined WNT +#if defined WIN32 #pragma warning ( disable: 4251 ) #endif