(MOUNTLIST_H_): New macro, to protect against double inclusion.

Include <sys/types.h>, for dev_t.
(ME_DUMMY, ME_REMOTE): Move to mountlist.c.

diff --git a/lib/mountlist.h b/lib/mountlist.h
index c3694c21131417d3fc7ec2b72821249cfe0b0755..c90a878271005097be179c351baf04d05e1be745 100644 (file)
--- 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