From 3d82b922c123b835ac65e2c165a7057f7b378c0b Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 10 Sep 2003 08:28:38 +0000 Subject: [PATCH] Include unconditionally. --- lib/basename.c | 8 ++++---- lib/dirname.c | 8 +++----- lib/stripslash.c | 8 +------- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/lib/basename.c b/lib/basename.c index 54f037e..5ff2989 100644 --- a/lib/basename.c +++ b/lib/basename.c @@ -1,5 +1,7 @@ /* basename.c -- return the last element in a path - Copyright (C) 1990, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + + Copyright (C) 1990, 1998, 1999, 2000, 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 @@ -19,10 +21,8 @@ # include #endif -#if STDC_HEADERS || HAVE_STRING_H -# include -#endif #include "dirname.h" +#include /* In general, we can't use the builtin `basename' function if available, since it has different meanings in different environments. diff --git a/lib/dirname.c b/lib/dirname.c index 131af8b..815192a 100644 --- a/lib/dirname.c +++ b/lib/dirname.c @@ -1,5 +1,5 @@ /* dirname.c -- return all but the last element in a path - Copyright 1990, 1998, 2000, 2001, 2003 Free Software Foundation, Inc. + Copyright (C) 1990, 1998, 2000, 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 @@ -19,11 +19,9 @@ # include #endif -#if STDC_HEADERS || HAVE_STRING_H -# include -#endif - #include "dirname.h" + +#include #include "xalloc.h" /* Return the length of `dirname (PATH)', or zero if PATH is diff --git a/lib/stripslash.c b/lib/stripslash.c index 73be737..c6b319e 100644 --- a/lib/stripslash.c +++ b/lib/stripslash.c @@ -1,5 +1,5 @@ /* stripslash.c -- remove redundant trailing slashes from a file name - Copyright (C) 1990, 2001 Free Software Foundation, Inc. + Copyright (C) 1990, 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 @@ -19,12 +19,6 @@ # include #endif -#if STDC_HEADERS || HAVE_STRING_H -# include -#else -# include -#endif - #include "dirname.h" /* Remove trailing slashes from PATH. -- 2.7.4