X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Frmdir.c;h=ddb5c30b2c866036ac0dad3b341d4ccabb5831a5;hb=7acea197e2d653876ae7113d5538a4544ce60d84;hp=2a92803db7e60c14f01b6cd4567657ca746d465d;hpb=f77f4c4457ab4a0cf4761ac2d5998e378be15d94;p=gnulib.git

diff --git a/lib/rmdir.c b/lib/rmdir.c
index 2a92803db..ddb5c30b2 100644
--- a/lib/rmdir.c
+++ b/lib/rmdir.c
@@ -1,5 +1,6 @@
 /* BSD compatible remove directory function for System V
-   Copyright (C) 1988, 1990 Free Software Foundation, Inc.
+
+   Copyright (C) 1988, 1990, 1999, 2003, 2004 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
@@ -21,19 +22,9 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-
 #include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
 
-#if STAT_MACROS_BROKEN
-# undef S_ISDIR
-#endif
-
-#if !defined(S_ISDIR) && defined(S_IFDIR)
-# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#endif
+#include "stat-macros.h"
 
 /* rmdir adapted from GNU tar.  */
 
@@ -41,8 +32,7 @@ extern int errno;
    Return 0 if successful, -1 if not.  */
 
 int
-rmdir (dpath)
-     char *dpath;
+rmdir (char const *dpath)
 {
   pid_t cpid;
   int status;