summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--defines.h12
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 @@
3 _res, prevents problems on some platforms that have _res as a global but 3 _res, prevents problems on some platforms that have _res as a global but
4 don't have getrrsetbyname(), eg IRIX 5.3. Found and tested by 4 don't have getrrsetbyname(), eg IRIX 5.3. Found and tested by
5 georg.schwarz at freenet.de, ok djm@. 5 georg.schwarz at freenet.de, ok djm@.
6 - (dtucker) [defines.h] Find a value for IOV_MAX or use a conservative
7 default. Patch originally from tim@, ok djm
6 8
720050506 920050506
8 - (dtucker) OpenBSD CVS Syn 10 - (dtucker) OpenBSD CVS Syn
@@ -4617,4 +4619,4 @@
4617 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4619 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4618 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4620 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4619 4621
4620$Id: ChangeLog,v 1.4325 2006/05/15 07:15:56 dtucker Exp $ 4622$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 @@
25#ifndef _DEFINES_H 25#ifndef _DEFINES_H
26#define _DEFINES_H 26#define _DEFINES_H
27 27
28/* $Id: defines.h,v 1.131 2006/03/15 02:02:28 djm Exp $ */ 28/* $Id: defines.h,v 1.132 2006/05/15 07:17:30 dtucker Exp $ */
29 29
30 30
31/* Constants */ 31/* Constants */
@@ -731,6 +731,16 @@ struct winsize {
731# undef HAVE_MMAP 731# undef HAVE_MMAP
732#endif 732#endif
733 733
734#ifndef IOV_MAX
735# if defined(_XOPEN_IOV_MAX)
736# define IOV_MAX _XOPEN_IOV_MAX
737# elif defined(DEF_IOV_MAX)
738# define IOV_MAX DEF_IOV_MAX
739# else
740# define IOV_MAX 16
741# endif
742#endif
743
734/* some system headers on HP-UX define YES/NO */ 744/* some system headers on HP-UX define YES/NO */
735#ifdef YES 745#ifdef YES
736# undef YES 746# undef YES