From f03f65c0f21ad7a4c5ecb33dea74a92a508874a0 Mon Sep 17 00:00:00 2001 From: nanbor Date: Wed, 8 Aug 2001 17:04:40 +0000 Subject: *** empty log message *** --- ace/OS.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ace/OS.h b/ace/OS.h index 6f29ca41a75..c799592637b 100644 --- a/ace/OS.h +++ b/ace/OS.h @@ -2976,7 +2976,9 @@ typedef unsigned int size_t; # define IOV_MAX 16 # endif /* IOV_MAX */ +# if !defined (ACE_IOV_MAX) #define ACE_IOV_MAX IOV_MAX +# endif /* ACE_IOV_MAX */ # if defined (ACE_PSOS_SNARFS_HEADER_INFO) // Header information snarfed from compiler provided header files @@ -5955,7 +5957,7 @@ public: * mutex should not be a recursive one, i.e., it should only be a * standard mutex or an error checking mutex. */ - static int mutex_lock (ACE_mutex_t *m, + static int mutex_lock (ACE_mutex_t *m, const ACE_Time_Value *timeout); /// Win32 note: Abandoned mutexes are not treated differently. 0 is -- cgit v1.2.1