summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2006-08-08 09:29:16 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2006-08-08 09:29:16 +0000
commite3a88040668149fc2f55afd8423496d99ce68096 (patch)
tree76ff97f8d64f9fde8c82ae9d15167f85c18d1d21
parentd615795b93a87c18425c1a94163932a8fd010ea8 (diff)
downloadATCD-e3a88040668149fc2f55afd8423496d99ce68096.tar.gz
Tue Aug 8 09:28:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ACE/ACE-INSTALL.html9
-rw-r--r--ACE/ChangeLog6
2 files changed, 9 insertions, 6 deletions
diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html
index 5928fb8af2e..7b703675012 100644
--- a/ACE/ACE-INSTALL.html
+++ b/ACE/ACE-INSTALL.html
@@ -1491,13 +1491,11 @@ Using the Cygnus tools, this approach works:
<a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/include/makeinclude/platform_vxworks5.5.x.GNU">the
g++/VxWorks platform file</a> for more information.<p>
</p></li><li>Create an <code>ACE_wrappers/ace/config.h</code> file that looks
- something like the following. tao_idl should be built to not support
- native exception handling, because that's not available on VxWorks.
+ something like the following.
<pre>#if defined (_MSC_VER) || defined (__BORLANDC__)
# include "ace/config-win32.h"
-# undef ACE_HAS_EXCEPTIONS
#else
-# include "ace/config-vxworks.h"
+# include "ace/config-vxworks5.x.h"
#endif
</pre><p>
</p></li><li>Set your <code>ACE_ROOT</code>, <code>CPP_LOCATION</code>,
@@ -1688,10 +1686,9 @@ Control Panel-&gt; System -&gt; Environment)</p>
<p>with entry</p>
<p>#if defined (_MSC_VER) || (__BORLANDC__)</p>
<p> #include "ace/config-win32.h"</p>
-<p> #undef ACE_HAS_EXCEPTIONS</p>
<p>#else</p>
-<p> #include "ace/config-vxworks5.x.h"</p>
<p> #define ACE_HAS_IP_MULTICAST </p>
+<p> #include "ace/config-vxworks5.x.h"</p>
<p>#endif</p>
<p>2) C:\Corba\ACE_wrappers\include\makeinclude\platform_macros.GNU</p>
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 590307e980b..aa27fed4113 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Tue Aug 8 09:28:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ACE-INSTALL.html:
+ Removed some parts of the VxWorks building instructions because
+ it was really wrong what was said
+
Tue Aug 8 09:15:00 UTC 2006 Simon Massey <sma@prismtech.com>
* ace/OS_Memory.h