From 7f4b1f45ce477f8374d382bd75f5f0a7e865e2c6 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 22 Mar 2009 09:30:44 +0100 Subject: [PATCH] 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 --- ChangeLog | 7 +++++++ lib/pathmax.h | 4 ++-- m4/pathmax.m4 | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e8f2f5d4..567c948dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2009-03-23 Jim Meyering + 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 diff --git a/lib/pathmax.h b/lib/pathmax.h index 6941e457e..f18d7600f 100644 --- 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 diff --git a/m4/pathmax.m4 b/m4/pathmax.m4 index e88fdb4ca..465180161 100644 --- 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 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_PATHMAX], [ dnl Prerequisites of lib/pathmax.h. + AC_CHECK_FUNCS_ONCE([pathconf]) AC_CHECK_HEADERS_ONCE([sys/param.h]) ]) -- 2.11.0