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 c6168724d95e65c1eea2e9d8867a102f41ce0198..a7164fb134697d34bd13231d9d7a6f8ae57e01ca 100644 (file)
--- a/restore/utilities.c
+++ b/restore/utilities.c
@@ -41,32 +41,29 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: utilities.c,v 1.11 2000/12/21 11:14:54 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"