Mercurial > hg > octave-nkf > gnulib-hg
changeset 11423:8c52e8ca6c8b
pathmax: PATH_MAX: use pathconf only when available
* lib/pathmax.h (PATH_MAX): Select the pathconf-using definition
only if HAVE_PATHCONF is defined. Patch by Sylvain Beucler.
* m4/pathmax.m4 (gl_PATHMAX): Check for pathconf.
This avoids a link failure in a PSP cross-compilation environment
described in http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/17048
author | Jim Meyering <meyering@redhat.com> |
---|---|
date | Sun, 22 Mar 2009 09:30:44 +0100 |
parents | 847931ff84ef |
children | 2b94c0e7849d |
files | ChangeLog lib/pathmax.h m4/pathmax.m4 |
diffstat | 3 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2009-03-23 Jim Meyering <meyering@redhat.com> + pathmax: PATH_MAX: use pathconf only when available + * lib/pathmax.h (PATH_MAX): Select the pathconf-using definition + only if HAVE_PATHCONF is defined. Patch by Sylvain Beucler. + * m4/pathmax.m4 (gl_PATHMAX): Check for pathconf. + This avoids a link failure in a PSP cross-compilation environment + described in http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/17048 + * lib/vasnprintf.c (divide): Fix typo in comment. 2009-03-23 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
--- a/lib/pathmax.h +++ b/lib/pathmax.h @@ -1,5 +1,5 @@ /* Define PATH_MAX somehow. Requires sys/types.h. - Copyright (C) 1992, 1999, 2001, 2003, 2005 Free Software Foundation, Inc. + Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ # define _POSIX_PATH_MAX 256 # endif -# if !defined PATH_MAX && defined _PC_PATH_MAX +# if !defined PATH_MAX && defined _PC_PATH_MAX && defined HAVE_PATHCONF # define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 \ : pathconf ("/", _PC_PATH_MAX)) # endif
--- a/m4/pathmax.m4 +++ b/m4/pathmax.m4 @@ -1,4 +1,4 @@ -# pathmax.m4 serial 7 +# pathmax.m4 serial 8 dnl Copyright (C) 2002, 2003, 2005, 2006, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -7,5 +7,6 @@ AC_DEFUN([gl_PATHMAX], [ dnl Prerequisites of lib/pathmax.h. + AC_CHECK_FUNCS_ONCE([pathconf]) AC_CHECK_HEADERS_ONCE([sys/param.h]) ])