From 1d0430ce1393d5d9187d56bdee5332bbeb6b15ba Mon Sep 17 00:00:00 2001 From: David Webster Date: Sat, 15 Apr 2000 00:38:35 +0000 Subject: [PATCH] VA 3.0 cannot utilize the _Export macro in this configuration git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/defs.h | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index d68f9b458d..57918e7389 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -403,18 +403,28 @@ typedef int wxWindowID; #elif defined(__WXPM__) -# ifdef WXMAKINGDLL -# define WXDLLEXPORT _Export -# define WXDLLEXPORT_DATA(type) _Export type -# define WXDLLEXPORT_CTORFN -# elif defined(WXUSINGDLL) -# define WXDLLEXPORT _Export -# define WXDLLEXPORT_DATA(type) _Export type -# define WXDLLEXPORT_CTORFN +# if (!(defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 ))) + +# ifdef WXMAKINGDLL +# define WXDLLEXPORT _Export +# define WXDLLEXPORT_DATA(type) _Export type +# define WXDLLEXPORT_CTORFN +# elif defined(WXUSINGDLL) +# define WXDLLEXPORT _Export +# define WXDLLEXPORT_DATA(type) _Export type +# define WXDLLEXPORT_CTORFN +# else +# define WXDLLEXPORT +# define WXDLLEXPORT_DATA(type) type +# define WXDLLEXPORT_CTORFN +# endif + # else + # define WXDLLEXPORT # define WXDLLEXPORT_DATA(type) type # define WXDLLEXPORT_CTORFN + # endif #else // !(MSW or OS2)