Andreas Dilger fixes (CPP, ext2 features, const char etc).

[dump.git] / restore / utilities.c

diff --git a/restore/utilities.c b/restore/utilities.c
index f052071484824a7fc41db11ad265f0e90507c728..a7164fb134697d34bd13231d9d7a6f8ae57e01ca 100644 (file)
--- a/restore/utilities.c
+++ b/restore/utilities.c
@@ -2,7 +2,8 @@
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997
- *     Stelian Pop <pop@cybercable.fr>, 1999-2000
+ *     Stelian Pop <pop@noos.fr>, 1999-2000
+ *     Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
  */
 
 /*
@@ -40,31 +41,29 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: utilities.c,v 1.8 2000/02/08 12:22:43 stelian Exp $";
+       "$Id: utilities.c,v 1.12 2001/03/19 13:22:49 stelian Exp $";
 #endif /* not lint */
 
+#include <config.h>
+#include <errno.h>
+#include <compaterr.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
 #include <sys/param.h>
 #include <sys/stat.h>
 
 #ifdef __linux__
 #include <sys/time.h>
 #include <linux/ext2_fs.h>
+#include <ext2fs/ext2fs.h>
 #include <bsdcompat.h>
 #else  /* __linux__ */
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
 #endif /* __linux__ */
 
-#include <errno.h>
-#include <compaterr.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifdef __linux__
-#include <ext2fs/ext2fs.h>
-#endif
-
 #include "restore.h"
 #include "extern.h"