diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-06-15 17:54:33 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-06-15 17:54:33 +0000 |
| commit | 6a63a785fb759c8e304ffe18b51bfeef9bf66a75 (patch) | |
| tree | 3d250ab0df39b0ab6818c77689010a40336d518e | |
| parent | d9eb82fb81e6245f349bdb69c37b6b894ae4a8a1 (diff) | |
| download | ATCD-6a63a785fb759c8e304ffe18b51bfeef9bf66a75.tar.gz | |
ChangeLogTag: Wed Jun 15 17:50:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/tao/Collocation_Proxy_Broker.h | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 93b9b891818..1f781745b22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jun 15 17:50:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/templates/bor.mpd: + reverse the libs, this solves a lot of problems in our static builds. + Wed Jun 15 07:46:16 2005 Chad Elliott <elliott_c@ociweb.com> * include/makeinclude/rules.bin.GNU: diff --git a/TAO/tao/Collocation_Proxy_Broker.h b/TAO/tao/Collocation_Proxy_Broker.h index bdd9921c033..420ddec654f 100644 --- a/TAO/tao/Collocation_Proxy_Broker.h +++ b/TAO/tao/Collocation_Proxy_Broker.h @@ -16,13 +16,14 @@ #include /**/ "ace/pre.h" -#include "ace/CORBA_macros.h" +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/TAO_Export.h" +#include "ace/CORBA_macros.h" +#include "ace/os_include/os_stddef.h" #include "tao/Collocation_Strategy.h" |