diff options
| author | jeliazkov_i <jeliazkov_i@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-05-04 16:25:21 +0000 |
|---|---|---|
| committer | jeliazkov_i <jeliazkov_i@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-05-04 16:25:21 +0000 |
| commit | 9273ea0ff9081037868da11500450995543f0683 (patch) | |
| tree | cbc216b6b30c614e75af8f69640f10cdd66b4065 | |
| parent | 33e86d5ccfe6a1bd7d6ebc146b33918c87b1e49d (diff) | |
| download | ATCD-9273ea0ff9081037868da11500450995543f0683.tar.gz | |
ChangeLogTag: Thu May 4 16:22:42 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL_Export.h | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 26a3785c2f0..580c2247032 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Thu May 4 16:22:42 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL_Export.h: + + Regenerated the file to fix a problem with building the test in + static builds. + Thu May 4 13:36:00 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> * tests/ORB_Local_Config/Service_Dependency/Test.cpp: diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL_Export.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL_Export.h index 3812349efcd..f9f8860f2cd 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL_Export.h +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL_Export.h @@ -9,6 +9,10 @@ #include "ace/config-all.h" +#if defined (ACE_AS_STATIC_LIBS) && !defined (SERVICE_CONFIG_ORB_DLL_HAS_DLL) +# define SERVICE_CONFIG_ORB_DLL_HAS_DLL 0 +#endif /* ACE_AS_STATIC_LIBS && SERVICE_CONFIG_ORB_DLL_HAS_DLL */ + #if !defined (SERVICE_CONFIG_ORB_DLL_HAS_DLL) # define SERVICE_CONFIG_ORB_DLL_HAS_DLL 1 #endif /* ! SERVICE_CONFIG_ORB_DLL_HAS_DLL */ |