From: Jim Meyering <meyering@redhat.com>
Date: Fri, 24 Jun 2011 07:12:59 +0000 (+0200)
Subject: maint: don't use gnulib's pathmax module; define PATH_MAX if needed
X-Git-Tag: v8.13~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54cbe6e6434d3a148778ff72eebc75b3ca98cd34;p=thirdparty%2Fcoreutils.git

maint: don't use gnulib's pathmax module; define PATH_MAX if needed

* bootstrap.conf (gnulib_modules): Remove pathmax.
* src/system.h: Don't include "pathmax.h".
(PATH_MAX) [!PATH_MAX]: Define to 8192.  Defining it to a constant
is preferable to using a definition from pathmax.h that might expand
to pathconf ("/", _PC_PATH_MAX). Prompted by discussion leading to:
http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/27183/focus=27269
---

diff --git a/bootstrap.conf b/bootstrap.conf
index c998384930..08bfc21864 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -158,7 +158,6 @@ gnulib_modules="
   nproc
   obstack
   parse-datetime
-  pathmax
   perl
   physmem
   posix-shell
diff --git a/src/system.h b/src/system.h
index 95ef2c3b36..d250d94f8d 100644
--- a/src/system.h
+++ b/src/system.h
@@ -40,11 +40,10 @@ you must include <sys/types.h> before including this file
 
 #include <unistd.h>
 
-/* limits.h must come before pathmax.h because limits.h on some systems
-   undefs PATH_MAX, whereas pathmax.h sets PATH_MAX.  */
 #include <limits.h>
-
-#include "pathmax.h"
+#ifndef PATH_MAX
+# define PATH_MAX 8192
+#endif
 
 #include "configmake.h"