From fe08779c6c643b07d5146fbf576581252fa18556 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Dejean?= <bdejean@src.gnome.org>
Date: Thu, 23 Sep 2004 22:47:56 +0000
Subject: [PATCH] Removed mountlist.h.

	* Makefile.am:
	* mountlist.c:
	* mountlist.h: Removed mountlist.h.
---
 sysdeps/common/ChangeLog   |  6 ++++++
 sysdeps/common/Makefile.am |  2 +-
 sysdeps/common/mountlist.c | 12 +++++++++++-
 sysdeps/common/mountlist.h | 27 ---------------------------
 4 files changed, 18 insertions(+), 29 deletions(-)
 delete mode 100644 sysdeps/common/mountlist.h

diff --git a/sysdeps/common/ChangeLog b/sysdeps/common/ChangeLog
index 0e4ac683..fd270913 100644
--- a/sysdeps/common/ChangeLog
+++ b/sysdeps/common/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-24  Benoît Dejean  <tazforever@dlfp.org>
+
+	* Makefile.am:
+	* mountlist.c:
+	* mountlist.h: Removed mountlist.h.
+
 2004-09-23  Benoît Dejean  <tazforever@dlfp.org>
 
 	* mountlist.c: (ignore_mount_entry): Added openpromfs.
diff --git a/sysdeps/common/Makefile.am b/sysdeps/common/Makefile.am
index 61acfe4d..9de6ac8b 100644
--- a/sysdeps/common/Makefile.am
+++ b/sysdeps/common/Makefile.am
@@ -15,7 +15,7 @@ noinst_LTLIBRARIES		= libgtop_common-2.0.la libgtop_suid_common-2.0.la
 
 libgtop_common_2_0_la_SOURCES	= error.c gnuslib.c \
 				  fsusage.c \
-                                  mountlist.c mountlist.h \
+                                  mountlist.c \
                                   procargs.c \
 				  $(inodedb_SRCLIST)
 
diff --git a/sysdeps/common/mountlist.c b/sysdeps/common/mountlist.c
index b6849168..0dc3dc73 100644
--- a/sysdeps/common/mountlist.c
+++ b/sysdeps/common/mountlist.c
@@ -22,7 +22,6 @@
 #include <glib.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include "mountlist.h"
 
 #if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
 #include <string.h>
@@ -33,6 +32,17 @@
 #include <glibtop.h>
 #include <glibtop/mountlist.h>
 
+/* A mount table entry. */
+struct mount_entry
+{
+  char *me_devname;             /* Device node pathname, including "/dev/". */
+  char *me_mountdir;            /* Mount point directory pathname. */
+  char *me_type;                /* "nfs", "4.2", etc. */
+  dev_t me_dev;                 /* Device number of me_mountdir. */
+  struct mount_entry *me_next;
+};
+
+
 static struct mount_entry *read_filesystem_list (void);
 
 #ifdef HAVE_SYS_PARAM_H
diff --git a/sysdeps/common/mountlist.h b/sysdeps/common/mountlist.h
deleted file mode 100644
index 8bc38f6a..00000000
--- a/sysdeps/common/mountlist.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* mountlist.h -- declarations for list of mounted filesystems
-   Copyright (C) 1991, 1992 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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* A mount table entry. */
-struct mount_entry
-{
-  char *me_devname;		/* Device node pathname, including "/dev/". */
-  char *me_mountdir;		/* Mount point directory pathname. */
-  char *me_type;		/* "nfs", "4.2", etc. */
-  dev_t me_dev;			/* Device number of me_mountdir. */
-  struct mount_entry *me_next;
-};
-