ChangeLogTag: Mon Jan 13 12:46:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 31 insertions, 8 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 14d49904024..7309f94847f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,14 +1,25 @@
+Mon Jan 13 12:47:12 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Transport.cpp:
+          Use ACE_IOV_MAX instead of IOV_MAX. IOV_MAX is defined as MAX_INT-1
+          with Cygwn and this gives compiles array because an array of this
+          size is allocated on the stack.
+
+        * tao/Makefile.tao:
+          When building shared lib then set the define TAO_BUILD_DLL, when
+          building statically set the define TAO_AS_STATIC_LIBS
+
 Fri Jan 10 19:36:56 2003  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
 
 	* tao/Transport_Cache_Manager.h:
 	* tao/Transport_Cache_Manager.cpp: Added a debug
 	  statement. Removed the method close_entries () which was under
-	  #if 0 guard. 
+	  #if 0 guard.
 
 	  The method is_entry_idle () was trying to make the transport as
 	  busy, which is horribly horribly bad. The method is_entry_idle
 	  () should only do one thing, ie. check whether the entry is idle
-	  or not! 
+	  or not!
 
 Fri Jan 10 08:28:34 2003  Frank Hunleth  <frank@hunleth.com>
 
@@ -21,11 +32,11 @@ Fri Jan 10 08:28:34 2003  Frank Hunleth  <frank@hunleth.com>
 	* orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp:
 	* orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h:
 
-	  Added code to check length of MIOP UniqueID so that it can be 
+	  Added code to check length of MIOP UniqueID so that it can be
 	  properly parsed.  Thanks to Chau Vincent
-	  <Vincent.Chau@fr.thalesgroup.com> for finding the problem when 
+	  <Vincent.Chau@fr.thalesgroup.com> for finding the problem when
 	  performing MIOP interoperability testing.  Also, added code to
-	  set the UniqueID and packet length fields properly per update to 
+	  set the UniqueID and packet length fields properly per update to
 	  the MIOP spec and tightened bounds checks on MIOP packets to
 	  prevent buffer overruns.
 
diff --git a/TAO/tao/Makefile.tao b/TAO/tao/Makefile.tao
index f0f6c5db49e..62f60e8aa7c 100644
--- a/TAO/tao/Makefile.tao
+++ b/TAO/tao/Makefile.tao
@@ -410,6 +410,18 @@ include $(TAO_ROOT)/taoconfig.mk
 #       Local targets (and local hacks)
 #----------------------------------------------------------------------------
 
+ifeq ($(shared_libs),1)
+ifneq ($(SHLIB),)
+CPPFLAGS     += -DTAO_BUILD_DLL
+endif
+endif
+
+ifeq ($(static_libs),1)
+ifneq ($(LIB),)
+CPPFLAGS     += -DTAO_AS_STATIC_LIBS
+endif
+endif
+
 # @@ Can we generalize this to something like this:
 # $(MANAGED_PIDL).target:
 # 	......
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 26271d293ba..f85ced23383 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -907,19 +907,19 @@ TAO_Transport::drain_queue_i (void)
   // the loop because after the loop there may still be data to be
   // sent
   int iovcnt = 0;
-  iovec iov[IOV_MAX];
+  iovec iov[ACE_IOV_MAX];
 
   // We loop over all the elements in the queue ...
   TAO_Queued_Message *i = this->head_;
   while (i != 0)
     {
       // ... each element fills the iovector ...
-      i->fill_iov (IOV_MAX, iovcnt, iov);
+      i->fill_iov (ACE_IOV_MAX, iovcnt, iov);
 
       // ... the vector is full, no choice but to send some data out.
       // We need to loop because a single message can span multiple
       // IOV_MAX elements ...
-      if (iovcnt == IOV_MAX)
+      if (iovcnt == ACE_IOV_MAX)
         {
           int retval =
             this->drain_queue_helper (iovcnt, iov);