diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2005-02-01 23:58:30 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2005-02-01 23:58:30 +0000 |
| commit | 52a43df1b18556e9dd1ee5916a88ed0c6027ce28 (patch) | |
| tree | 3dd1cc6693b6b68616e51401d89ca93f3263bb86 | |
| parent | c4a0cafe715f323c2b03a4cf12f43a75882a3922 (diff) | |
| download | coreutils-52a43df1b18556e9dd1ee5916a88ed0c6027ce28.tar.xz | |
(MOUNTLIST_H_): New macro, to protect against double inclusion.
Include <sys/types.h>, for dev_t.
(ME_DUMMY, ME_REMOTE): Move to mountlist.c.
| -rw-r--r-- | lib/mountlist.h | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/lib/mountlist.h b/lib/mountlist.h index c3694c211..c90a87827 100644 --- a/lib/mountlist.h +++ b/lib/mountlist.h @@ -1,7 +1,7 @@ /* mountlist.h -- declarations for list of mounted file systems - Copyright (C) 1991, 1992, 1998, 2000, 2001, 2002, 2003, 2004 Free - Software Foundation, Inc. + Copyright (C) 1991, 1992, 1998, 2000, 2001, 2002, 2003, 2004, 2005 + 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 @@ -17,7 +17,11 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef MOUNTLIST_H_ +#define MOUNTLIST_H_ + #include <stdbool.h> +#include <sys/types.h> /* A mount table entry. */ struct mount_entry @@ -34,22 +38,4 @@ struct mount_entry struct mount_entry *read_file_system_list (bool need_fs_type); -#ifndef ME_DUMMY -# define ME_DUMMY(Fs_name, Fs_type) \ - (!strcmp (Fs_type, "autofs") \ - /* for Irix 6.5 */ \ - || !strcmp (Fs_type, "ignore")) -#endif - -#undef STREQ -#define STREQ(a, b) (strcmp ((a), (b)) == 0) - -#ifndef ME_REMOTE -/* A file system is `remote' if its Fs_name contains a `:' - or if (it is of type smbfs and its Fs_name starts with `//'). */ -# define ME_REMOTE(Fs_name, Fs_type) \ - (strchr ((Fs_name), ':') != 0 \ - || ((Fs_name)[0] == '/' \ - && (Fs_name)[1] == '/' \ - && STREQ (Fs_type, "smbfs"))) #endif |