diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-01-07 18:59:38 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-01-07 18:59:38 +0000 |
| commit | 42e9dabc4f00b0cebeda3a7d51eb428df32c6d6a (patch) | |
| tree | 86df8413902f008d81d405ce2e01621765effaaf | |
| parent | 14aade41b415962aef3fe3834c8c116e11d7f704 (diff) | |
| download | ATCD-42e9dabc4f00b0cebeda3a7d51eb428df32c6d6a.tar.gz | |
ChangeLogTag: Wed Jan 7 18:57:54 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORB_export.h | 12 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORB_export.h | 12 |
3 files changed, 24 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e16ae1bc74a..cd88f16ad15 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Wed Jan 7 18:57:54 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h: + Added check for TAO_AS_STATIC_LIBS for setting the export flags for + proper building of static libraries. + Wed Jan 7 18:55:11 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/orbsvcs/IFRService/ifr_service_export.h diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORB_export.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORB_export.h index ce0a659e3a9..37769e226ad 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORB_export.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORB_export.h @@ -9,9 +9,15 @@ #include "ace/config-all.h" -#if !defined (TAO_FT_CLIENTORB_HAS_DLL) -# define TAO_FT_CLIENTORB_HAS_DLL 1 -#endif /* ! TAO_FT_CLIENTORB_HAS_DLL */ +#if defined (TAO_AS_STATIC_LIBS) +# if !defined (TAO_FT_CLIENTORB_HAS_DLL) +# define TAO_FT_CLIENTORB_HAS_DLL 0 +# endif /* ! TAO_FT_CLIENTORB_HAS_DLL */ +#else +# if !defined (TAO_FT_CLIENTORB_HAS_DLL) +# define TAO_FT_CLIENTORB_HAS_DLL 1 +# endif /* ! TAO_FT_CLIENTORB_HAS_DLL */ +#endif #if defined (TAO_FT_CLIENTORB_HAS_DLL) && (TAO_FT_CLIENTORB_HAS_DLL == 1) # if defined (TAO_FT_CLIENTORB_BUILD_DLL) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORB_export.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORB_export.h index 286802e0f43..565f0b73165 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORB_export.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORB_export.h @@ -9,9 +9,15 @@ #include "ace/config-all.h" -#if !defined (TAO_FT_SERVERORB_HAS_DLL) -# define TAO_FT_SERVERORB_HAS_DLL 1 -#endif /* ! TAO_FT_SERVERORB_HAS_DLL */ +#if defined (TAO_AS_STATIC_LIBS) +# if !defined (TAO_FT_SERVERORB_HAS_DLL) +# define TAO_FT_SERVERORB_HAS_DLL 0 +# endif /* ! TAO_FT_SERVERORB_HAS_DLL */ +#else +# if !defined (TAO_FT_SERVERORB_HAS_DLL) +# define TAO_FT_SERVERORB_HAS_DLL 1 +# endif /* ! TAO_FT_SERVERORB_HAS_DLL */ +#endif #if defined (TAO_FT_SERVERORB_HAS_DLL) && (TAO_FT_SERVERORB_HAS_DLL == 1) # if defined (TAO_FT_SERVERORB_BUILD_DLL) |