Avoid some C++ diagnostics reported by Bruno Haible.

[gnulib.git] / lib / isdir.c

diff --git a/lib/isdir.c b/lib/isdir.c
index dbc9bd0..f328dbb 100644 (file)
--- a/lib/isdir.c
+++ b/lib/isdir.c
@@ -1,5 +1,6 @@
 /* isdir.c -- determine whether a directory exists
-   Copyright (C) 1990 Free Software Foundation, Inc.
+
+   Copyright (C) 1990, 1998, 2006 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
@@ -12,34 +13,29 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "safe-stat.h"
-
-#ifdef STAT_MACROS_BROKEN
-#undef S_ISDIR
-#endif /* STAT_MACROS_BROKEN.  */
+#if STAT_MACROS_BROKEN
+# undef S_ISDIR
+#endif
 
-#if !defined(S_ISDIR) && defined(S_IFDIR)
-#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+#if !defined S_ISDIR && defined S_IFDIR
+# define S_ISDIR(Mode) (((Mode) & S_IFMT) == S_IFDIR)
 #endif
 
 /* If PATH is an existing directory or symbolic link to a directory,
    return nonzero, else 0.  */
 
 int
-isdir (path)
-     char *path;
+isdir (const char *path)
 {
   struct stat stats;
 
-  return SAFE_STAT (path, &stats) == 0 && S_ISDIR (stats.st_mode);
+  return stat (path, &stats) == 0 && S_ISDIR (stats.st_mode);
 }