From cefd8bb36d307a671fbbe5358d94c97910edf7c6 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Mon, 15 May 2006 17:17:29 +1000 Subject: - (dtucker) [defines.h] Find a value for IOV_MAX or use a conservative default. Patch originally from tim@, ok djm --- ChangeLog | 4 +++- defines.h | 12 +++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a9110633..a26f06323 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ _res, prevents problems on some platforms that have _res as a global but don't have getrrsetbyname(), eg IRIX 5.3. Found and tested by georg.schwarz at freenet.de, ok djm@. + - (dtucker) [defines.h] Find a value for IOV_MAX or use a conservative + default. Patch originally from tim@, ok djm 20050506 - (dtucker) OpenBSD CVS Syn @@ -4617,4 +4619,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4325 2006/05/15 07:15:56 dtucker Exp $ +$Id: ChangeLog,v 1.4326 2006/05/15 07:17:29 dtucker Exp $ diff --git a/defines.h b/defines.h index 9ecf18d5a..f2fdd3cad 100644 --- a/defines.h +++ b/defines.h @@ -25,7 +25,7 @@ #ifndef _DEFINES_H #define _DEFINES_H -/* $Id: defines.h,v 1.131 2006/03/15 02:02:28 djm Exp $ */ +/* $Id: defines.h,v 1.132 2006/05/15 07:17:30 dtucker Exp $ */ /* Constants */ @@ -731,6 +731,16 @@ struct winsize { # undef HAVE_MMAP #endif +#ifndef IOV_MAX +# if defined(_XOPEN_IOV_MAX) +# define IOV_MAX _XOPEN_IOV_MAX +# elif defined(DEF_IOV_MAX) +# define IOV_MAX DEF_IOV_MAX +# else +# define IOV_MAX 16 +# endif +#endif + /* some system headers on HP-UX define YES/NO */ #ifdef YES # undef YES -- cgit v1.2.3