From: Bruno Haible <bruno@clisp.org>
Date: Tue, 19 Nov 2002 20:11:00 +0000 (+0000)
Subject: Merge with gnulib.
X-Git-Tag: v0.12~1205
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f97f30dda22adcf975fe6842d933b2951646a283;p=thirdparty%2Fgettext.git

Merge with gnulib.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index e5c25297f..93d4b2167 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,6 @@
 2002-11-19  Bruno Haible  <bruno@clisp.org>
 
+	* pathmax.h: Update from current gnulib version.
 	* obstack.h: Update from current gnulib version.
 	* obstack.c: Update from current gnulib version.
 
diff --git a/lib/pathmax.h b/lib/pathmax.h
index 19d430407..de9313b0a 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 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1999, 2001 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
@@ -18,14 +18,14 @@
 #ifndef _PATHMAX_H
 # define _PATHMAX_H
 
-# ifdef HAVE_UNISTD_H
+# if HAVE_UNISTD_H
 #  include <unistd.h>
 # endif
 
 /* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
    PATH_MAX but might cause redefinition warnings when sys/param.h is
    later included (as on MORE/BSD 4.3).  */
-# if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__))
+# if defined _POSIX_VERSION || (defined HAVE_LIMITS_H && !defined __GNUC__)
 #  include <limits.h>
 # endif
 
@@ -33,17 +33,17 @@
 #  define _POSIX_PATH_MAX 255
 # endif
 
-# if !defined(PATH_MAX) && defined(_PC_PATH_MAX)
+# if !defined PATH_MAX && defined _PC_PATH_MAX
 #  define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 \
 		    : pathconf ("/", _PC_PATH_MAX))
 # endif
 
 /* Don't include sys/param.h if it already has been.  */
-# if defined(HAVE_SYS_PARAM_H) && !defined(PATH_MAX) && !defined(MAXPATHLEN)
+# if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
 #  include <sys/param.h>
 # endif
 
-# if !defined(PATH_MAX) && defined(MAXPATHLEN)
+# if !defined PATH_MAX && defined MAXPATHLEN
 #  define PATH_MAX MAXPATHLEN
 # endif