diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-01-07 18:54:39 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-01-07 18:54:39 +0000 |
| commit | 98a53dec38def69cb4948646d2b8530613cfd5d6 (patch) | |
| tree | 8edb512aba7ca7856b34090f2881f47f195deead /TAO | |
| parent | e739484f919591adb5ddbb0baf9ed18bb2b657a5 (diff) | |
| download | ATCD-98a53dec38def69cb4948646d2b8530613cfd5d6.tar.gz | |
ChangeLogTag: Wed Jan 7 18:53:32 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/ifr_service_export.h | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 827e776c127..cdac5e664f8 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Wed Jan 7 18:53:32 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/RTScheduling/rtscheduler_export.h: + Added check for TAO_AS_STATIC_LIBS for setting the export flags for + proper building of static libraries. + Wed Jan 7 18:48:13 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * tao/Utils/utils_export.h: diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ifr_service_export.h b/TAO/orbsvcs/orbsvcs/IFRService/ifr_service_export.h index bdfebe872d4..4e1aed48095 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ifr_service_export.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ifr_service_export.h @@ -9,9 +9,15 @@ #include "ace/config-all.h" -#if !defined (TAO_IFRSERVICE_HAS_DLL) -# define TAO_IFRSERVICE_HAS_DLL 1 -#endif /* ! TAO_IFRSERVICE_HAS_DLL */ +#if defined (TAO_AS_STATIC_LIBS) +# if !defined (TAO_IFRSERVICE_HAS_DLL) +# define TAO_IFRSERVICE_HAS_DLL 0 +# endif /* ! TAO_IFRSERVICE_HAS_DLL */ +#else +# if !defined (TAO_IFRSERVICE_HAS_DLL) +# define TAO_IFRSERVICE_HAS_DLL 1 +# endif /* ! TAO_IFRSERVICE_HAS_DLL */ +#endif #if defined (TAO_IFRSERVICE_HAS_DLL) && (TAO_IFRSERVICE_HAS_DLL == 1) # if defined (TAO_IFRSERVICE_BUILD_DLL) |