summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2003-01-22 17:04:19 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2003-01-22 17:04:19 +0000
commit57a291ce50e05aa840f8b038745cdca464043d2a (patch)
tree5142b793c6068cd4a38c30e06c576c9701c94f59
parentb5f164f90c2ea5997ac4cb09539536fde25422f3 (diff)
downloadATCD-57a291ce50e05aa840f8b038745cdca464043d2a.tar.gz
ChangeLogTag: Wed Jan 22 17:01:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp4
2 files changed, 9 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index aec65bde5e2..ac9ecf5d046 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jan 22 17:03:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp:
+ Use ACE_IOV_MAX instead of IOV_MAX. IOV_MAX is defined as
+ MAX_INT-1 with Cygwn and this gives compiles errors because
+ an array as struct member of this size is too large.
+
Wed Jan 22 16:34:32 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
* Makefile.RTCORBAEvent:
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
index da9c3eb7e60..9a86f61ed39 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
@@ -115,7 +115,7 @@ TAO_UIPMC_Transport::messaging_object (void)
struct MIOP_Packet
{
- iovec iov[IOV_MAX];
+ iovec iov[ACE_IOV_MAX];
int iovcnt;
int length;
};
@@ -299,7 +299,7 @@ TAO_UIPMC_Transport::send_i (iovec *iov, int iovcnt,
// Check if we've filled up this fragment or if we've run out of
// iov entries.
if (current_fragment->length == MIOP_MAX_DGRAM_SIZE ||
- current_fragment->iovcnt == IOV_MAX)
+ current_fragment->iovcnt == ACE_IOV_MAX)
{
// Make a new fragment.
num_fragments++;