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

[dump.git] / dump / tape.c

diff --git a/dump/tape.c b/dump/tape.c
index ae2fe1c6cc51255b6f38c37f534a979b3137cce5..f43c3a20a9b3d4aae071afcb90ca90bd3641ebac 100644 (file)
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -41,10 +41,24 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: tape.c,v 1.33 2001/03/18 15:35:44 stelian Exp $";
+       "$Id: tape.c,v 1.34 2001/03/19 13:22:48 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <setjmp.h>
+#include <signal.h>
+#include <stdio.h>
+#include <compaterr.h>
+#ifdef __STDC__
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#else
+int    write(), read();
+#endif
+
 #ifdef __linux__
 #include <sys/types.h>
 #include <time.h>
@@ -56,9 +70,9 @@ static const char rcsid[] =
 #include <sys/wait.h>
 #ifdef __linux__
 #include <linux/ext2_fs.h>
+#include <ext2fs/ext2fs.h>
 #include <bsdcompat.h>
-#else  /* __linux__ */
-#ifdef sunos
+#elif defined sunos
 #include <sys/vnode.h>
 
 #include <ufs/fs.h>
@@ -66,29 +80,10 @@ static const char rcsid[] =
 #else
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
-#endif
 #endif /* __linux__ */
 
 #include <protocols/dumprestore.h>
 
-#include <errno.h>
-#include <fcntl.h>
-#include <setjmp.h>
-#include <signal.h>
-#include <stdio.h>
-#include <compaterr.h>
-#ifdef __STDC__
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#else
-int    write(), read();
-#endif
-
-#ifdef __linux__
-#include <ext2fs/ext2fs.h>
-#endif
-
 #ifdef HAVE_ZLIB
 #include <zlib.h>
 #endif /* HAVE_ZLIB */