Check for the e2fsprogs header <ext2fs/ext2_fs.h> instead of the kernel header if...

[dump.git] / restore / interactive.c

diff --git a/restore/interactive.c b/restore/interactive.c
index f2f3ae80dc06c497e84ebb62692d0fefdaea0019..c8f54f5dfa92a2de432a57131f732a106201210c 100644 (file)
--- a/restore/interactive.c
+++ b/restore/interactive.c
@@ -41,14 +41,19 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: interactive.c,v 1.14 2000/12/04 15:43:17 stelian Exp $";
+       "$Id: interactive.c,v 1.17 2001/06/18 10:58:28 stelian Exp $";
 #endif /* not lint */
 
+#include <config.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 
 #ifdef __linux__
+#ifdef HAVE_EXT2FS_EXT2_FS_H
+#include <ext2fs/ext2_fs.h>
+#else
 #include <linux/ext2_fs.h>
+#endif
 #include <bsdcompat.h>
 #else  /* __linux__ */
 #include <ufs/ufs/dinode.h>
@@ -96,7 +101,7 @@ static int pflag = 0;                /* prompt mode */
  * Structure and routines associated with listing directories.
  */
 struct afile {
-       ino_t   fnum;           /* inode number of file */
+       dump_ino_t fnum;        /* inode number of file */
        char    *fname;         /* file name */
        short   len;            /* name length */
        char    prefix;         /* prefix character */
@@ -125,7 +130,7 @@ void
 runcmdshell(void)
 {
        register struct entry *np;
-       ino_t ino;
+       dump_ino_t ino;
        struct arglist arglist;
        char curdir[MAXPATHLEN];
        char name[MAXPATHLEN];