X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling%2FMEDCoupling.hxx;h=7659dd347ba2831f3b3fa63c9d0aee725962e08a;hb=2ae2dc6fcedbf241c7637284b3c7bde12aded04a;hp=d732798dedba48184141616b869c400d292b6e3e;hpb=10f37bf6f33a762626d7f1093b2f5450c1688667;p=tools%2Fmedcoupling.git diff --git a/src/MEDCoupling/MEDCoupling.hxx b/src/MEDCoupling/MEDCoupling.hxx index d732798de..7659dd347 100644 --- a/src/MEDCoupling/MEDCoupling.hxx +++ b/src/MEDCoupling/MEDCoupling.hxx @@ -1,9 +1,9 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D +// Copyright (C) 2007-2020 CEA/DEN, EDF 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. +// 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 @@ -16,12 +16,13 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // +// Author : Anthony Geay (CEA/DEN) #ifndef _MEDCOUPLING_HXX_ #define _MEDCOUPLING_HXX_ -#ifdef WNT -# if defined medcoupling_EXPORTS +#ifdef WIN32 +# if defined(medcoupling_EXPORTS) || defined(medcouplingcpp_EXPORTS) # define MEDCOUPLING_EXPORT __declspec( dllexport ) # else # define MEDCOUPLING_EXPORT __declspec( dllimport ) @@ -30,7 +31,7 @@ # define MEDCOUPLING_EXPORT #endif -#ifdef WNT +#ifdef WIN32 # if defined medcouplingremapper_EXPORTS # define MEDCOUPLINGREMAPPER_EXPORT __declspec( dllexport ) # else @@ -40,7 +41,7 @@ # define MEDCOUPLINGREMAPPER_EXPORT #endif -#ifdef WNT +#ifdef WIN32 #pragma warning( disable : 4290 ) #endif