diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-01-07 18:49:47 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-01-07 18:49:47 +0000 |
| commit | 48b535e3b9a81b4f2b588b0677e7b742d5f300a0 (patch) | |
| tree | 17b73505bb18b5aebdf1fb8d02aa031fb0b065eb | |
| parent | e6c70a1434e0fd98c97d0c7d58b65bc816e5b32d (diff) | |
| download | ATCD-48b535e3b9a81b4f2b588b0677e7b742d5f300a0.tar.gz | |
ChangeLogTag: Wed Jan 7 18:48:13 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/Utils/utils_export.h | 12 |
2 files changed, 16 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 49e85ac4130..827e776c127 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,8 +1,14 @@ +Wed Jan 7 18:48:13 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/Utils/utils_export.h: + Added check for TAO_AS_STATIC_LIBS for setting the export flags for + proper building of static libraries. + Wed Jan 7 12:38:42 2004 Brian Mendel <brian.r.mendel@boeing.com> * orbsvcs/orbsvcs/Event/rtkokyu_event_export.h: - Added check for TAO_AS_STATIC_LIBS for setting the export flags for + Added check for TAO_AS_STATIC_LIBS for setting the export flags for proper building of static libraries. Wed Jan 7 12:16:15 2004 Chad Elliott <elliott_c@ociweb.com> diff --git a/TAO/tao/Utils/utils_export.h b/TAO/tao/Utils/utils_export.h index 133bd5c7c02..5cf8c0c40a0 100644 --- a/TAO/tao/Utils/utils_export.h +++ b/TAO/tao/Utils/utils_export.h @@ -9,9 +9,15 @@ #include "ace/config-all.h" -#if !defined (TAO_UTILS_HAS_DLL) -# define TAO_UTILS_HAS_DLL 1 -#endif /* ! TAO_UTILS_HAS_DLL */ +#if defined (TAO_AS_STATIC_LIBS) +# if !defined (TAO_UTILS_HAS_DLL) +# define TAO_UTILS_HAS_DLL 0 +# endif /* ! TAO_UTILS_HAS_DLL */ +#else +# if !defined (TAO_UTILS_HAS_DLL) +# define TAO_UTILS_HAS_DLL 1 +# endif /* ! TAO_UTILS_HAS_DLL */ +#endif #if defined (TAO_UTILS_HAS_DLL) && (TAO_UTILS_HAS_DLL == 1) # if defined (TAO_UTILS_BUILD_DLL) |