From fe4fc02d7b9023eba77428bd6a82948785ad5637 Mon Sep 17 00:00:00 2001 From: apn Date: Thu, 6 Oct 2016 12:36:21 +0300 Subject: [PATCH] 0027864: Add vtk support to products java wrapper Fix redefinition IVtkVTK_EXPORT error during wrapping in products java sample. Removed defined(__WIN32__) --- src/IVtkVTK/IVtkVTK_ShapeData.hxx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/IVtkVTK/IVtkVTK_ShapeData.hxx b/src/IVtkVTK/IVtkVTK_ShapeData.hxx index 935921e704..94b528986e 100644 --- a/src/IVtkVTK/IVtkVTK_ShapeData.hxx +++ b/src/IVtkVTK/IVtkVTK_ShapeData.hxx @@ -26,14 +26,16 @@ class IVtkVTK_ShapeData; DEFINE_STANDARD_HANDLE( IVtkVTK_ShapeData, IVtk_IShapeData ) // macros to export static field in class -#if (defined(_WIN32) || defined(__WIN32__)) - #ifdef __IVtkVTK_DLL - #define IVtkVTK_EXPORT __declspec(dllexport) +#ifndef IVtkVTK_EXPORT + #ifdef _WIN32 + #ifdef __IVtkVTK_DLL + #define IVtkVTK_EXPORT __declspec(dllexport) + #else + #define IVtkVTK_EXPORT __declspec(dllimport) + #endif #else - #define IVtkVTK_EXPORT __declspec(dllimport) + #define IVtkVTK_EXPORT #endif -#else - #define IVtkVTK_EXPORT #endif //! @class IVtkVTK_ShapeData