Assume <limits.h> exists.

5 files changed, 16 insertions, 17 deletions

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 730b579..e78b8b4 100644
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-28  Paul Eggert  <eggert@twinsun.com>
+
+	* pathmax.h: Include <limits.h> without checking for HAVE_LIMITS_H.
+	* addext.c: Likewise.
+	* backupfile.c: Likewise.
+	* xreadlink.c: Likewise.
+
 2003-06-23  Bruno Haible  <bruno@clisp.org>
 
 	Avoid compilation units that are empty after preprocessing.
diff --git a/gettext-tools/lib/addext.c b/gettext-tools/lib/addext.c
index ec6c42e..d2c8aa8 100644
--- a/gettext-tools/lib/addext.c
+++ b/gettext-tools/lib/addext.c
@@ -1,5 +1,5 @@
 /* addext.c -- add an extension to a file name
-   Copyright (C) 1990, 1997-1999, 2001-2002 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1997-1999, 2001-2003 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
@@ -31,9 +31,7 @@
 
 #include "backupfile.h"
 
-#if HAVE_LIMITS_H
-# include <limits.h>
-#endif
+#include <limits.h>
 #ifndef _POSIX_NAME_MAX
 # define _POSIX_NAME_MAX 14
 #endif
diff --git a/gettext-tools/lib/backupfile.c b/gettext-tools/lib/backupfile.c
index 24e0043..e3f8523 100644
--- a/gettext-tools/lib/backupfile.c
+++ b/gettext-tools/lib/backupfile.c
@@ -1,5 +1,5 @@
 /* backupfile.c -- make Emacs style backup file names
-   Copyright (C) 1990-1999, 2000-2002 Free Software Foundation, Inc.
+   Copyright (C) 1990-1999, 2000-2003 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
@@ -68,12 +68,8 @@
 # define HAVE_DIR 0
 #endif
 
-#if HAVE_LIMITS_H
-# include <limits.h>
-#endif
-#ifndef CHAR_BIT
-# define CHAR_BIT 8
-#endif
+#include <limits.h>
+
 /* Upper bound on the string length of an integer converted to string.
    302 / 1000 is ceil (log10 (2.0)).  Subtract 1 for the sign bit;
    add 1 for integer division truncation; add 1 more for a minus sign.  */
diff --git a/gettext-tools/lib/pathmax.h b/gettext-tools/lib/pathmax.h
index de9313b..bdd756e 100644
--- a/gettext-tools/lib/pathmax.h
+++ b/gettext-tools/lib/pathmax.h
@@ -1,5 +1,5 @@
 /* Define PATH_MAX somehow.  Requires sys/types.h.
-   Copyright (C) 1992, 1999, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1999, 2001, 2003 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
@@ -25,7 +25,7 @@
 /* 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 __GNUC__
 #  include <limits.h>
 # endif
 
diff --git a/gettext-tools/lib/xreadlink.c b/gettext-tools/lib/xreadlink.c
index 0322ca7..e4ef990 100644
--- a/gettext-tools/lib/xreadlink.c
+++ b/gettext-tools/lib/xreadlink.c
@@ -1,6 +1,6 @@
 /* xreadlink.c -- readlink wrapper to return the link name in malloc'd storage
 
-   Copyright 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003 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
@@ -34,9 +34,7 @@
 extern int errno;
 #endif
 
-#if HAVE_LIMITS_H
-# include <limits.h>
-#endif
+#include <limits.h>
 #if HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif