From 32688038bd0bea5a450194ffdc409d89e8ffdd0e Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 7 Jan 2004 18:57:17 +0000 Subject: ChangeLogTag: Wed Jan 7 18:55:11 UTC 2004 Johnny Willemsen --- TAO/ChangeLog | 6 ++++++ TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h | 12 +++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'TAO') diff --git a/TAO/ChangeLog b/TAO/ChangeLog index cdac5e664f8..e16ae1bc74a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Wed Jan 7 18:55:11 UTC 2004 Johnny Willemsen + + * orbsvcs/orbsvcs/IFRService/ifr_service_export.h + Added check for TAO_AS_STATIC_LIBS for setting the export flags for + proper building of static libraries. + Wed Jan 7 18:53:32 UTC 2004 Johnny Willemsen * tao/RTScheduling/rtscheduler_export.h: diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h index 38cb1774e84..2c404b4a134 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h @@ -9,9 +9,15 @@ #include "ace/config-all.h" -#if !defined (TAO_FTRTEC_HAS_DLL) -# define TAO_FTRTEC_HAS_DLL 1 -#endif /* ! TAO_FTRTEC_HAS_DLL */ +#if defined (TAO_AS_STATIC_LIBS) +# if !defined (TAO_FTRTEC_HAS_DLL) +# define TAO_FTRTEC_HAS_DLL 0 +# endif /* ! TAO_FTRTEC_HAS_DLL */ +#else +# if !defined (TAO_FTRTEC_HAS_DLL) +# define TAO_FTRTEC_HAS_DLL 1 +# endif /* ! TAO_FTRTEC_HAS_DLL */ +#endif #if defined (TAO_FTRTEC_HAS_DLL) && (TAO_FTRTEC_HAS_DLL == 1) # if defined (TAO_FTRTEC_BUILD_DLL) -- cgit v1.2.1