X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmountlist.c;h=f62a6e78824c8c032d6474afc2b71d4485c38de7;hb=6e0c9a99ac662dd811105992a9c9f5f611569590;hp=79f0d535ed43274c9e23c2c30fc8629e6d65e0cd;hpb=92f1833affa37844e22d2ebe4ca4c6ba924377f4;p=gnulib.git

diff --git a/lib/mountlist.c b/lib/mountlist.c
index 79f0d535e..f62a6e788 100644
--- a/lib/mountlist.c
+++ b/lib/mountlist.c
@@ -1,5 +1,5 @@
 /* mountlist.c -- return a list of mounted filesystems
-   Copyright (C) 1991, 1992, 1997-2001 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1992, 1997-2002 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,8 +21,7 @@
 
 #include <stdio.h>
 #include <sys/types.h>
-#include "mountlist.h"
-#include "unlocked-io.h"
+
 
 #ifdef STDC_HEADERS
 # include <stdlib.h>
@@ -34,13 +33,11 @@ void free ();
 #else
 # include <strings.h>
 #endif
+#include "xalloc.h"
 
 #ifndef strstr
 char *strstr ();
 #endif
-char *xmalloc ();
-char *xrealloc ();
-char *xstrdup ();
 
 #include <errno.h>
 #ifndef errno
@@ -139,12 +136,16 @@ extern int errno;
 # include <sys/mntent.h>
 #endif
 
+#undef MNT_IGNORE
 #if defined MNTOPT_IGNORE && defined HAVE_HASMNTOPT
 # define MNT_IGNORE(M) hasmntopt ((M), MNTOPT_IGNORE)
 #else
 # define MNT_IGNORE(M) 0
 #endif
 
+#include "mountlist.h"
+#include "unlocked-io.h"
+
 #ifdef MOUNTED_GETMNTENT1	/* 4.3BSD, SunOS, HP-UX, Dynix, Irix.  */
 /* Return the value of the hexadecimal number represented by CP.
    No prefix (like '0x') or suffix (like 'h') is expected to be