summaryrefslogtreecommitdiff
path: root/lib/rmdir.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2004-08-07 00:09:38 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2004-08-07 00:09:38 +0000
commita62be9f4039b4499cfbb76e394cad2259d03fa84 (patch)
tree5f444ac72b8b2418f2530af42b6c2fee823d18db /lib/rmdir.c
parent4d52451995952d65b6772a7849e88866b3542157 (diff)
downloadgnulib-a62be9f4039b4499cfbb76e394cad2259d03fa84.tar.gz
Merge from coreutils.
Diffstat (limited to 'lib/rmdir.c')
-rw-r--r--lib/rmdir.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/lib/rmdir.c b/lib/rmdir.c
index 5315711c32..ddb5c30b2c 100644
--- a/lib/rmdir.c
+++ b/lib/rmdir.c
@@ -1,6 +1,6 @@
/* BSD compatible remove directory function for System V
- Copyright (C) 1988, 1990, 1999, 2003 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
@@ -22,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. */