Merge remote branch 'origin/V7_dev'

[plugins/hexablockplugin.git] / src / HEXABLOCKPlugin / HEXABLOCKPlugin_Defs.hxx

diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Defs.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Defs.hxx
index cd305d180d0009ffae5b232f8aa20d4d7e2a35fc..0a6291ff6d490c4621de2c6978119c9f70be2bda 100755 (executable)
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Defs.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Defs.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2009-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2009-2016  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
@@ -25,13 +25,13 @@
 #define _HEXABLOCKPlugin_DEFS_HXX_
 
 #ifdef WIN32
-  #if defined HEXABLOCKPLUGIN_EXPORTS || defined HEXABLOCKEngine_EXPORTS
-    #define HEXABLOCKPLUGIN_EXPORT __declspec( dllexport )
+  #if defined HEXABLOCKENGINE_EXPORTS || defined HexaBlockPluginEngine_EXPORTS
+    #define HEXABLOCKPLUGINENGINE_EXPORT __declspec( dllexport )
   #else
-    #define HEXABLOCKPLUGIN_EXPORT __declspec( dllimport )
+    #define HEXABLOCKPLUGINENGINE_EXPORT __declspec( dllimport )
   #endif
 #else
-  #define HEXABLOCKPLUGIN_EXPORT
+  #define HEXABLOCKPLUGINENGINE_EXPORT
 #endif
 
 #endif