aboutsummaryrefslogtreecommitdiff
path: root/e2fsprogs/ext2fs
diff options
context:
space:
mode:
authorvodz <vodz@69ca8d6d-28ef-0310-b511-8ec308f3f277>2005-10-10 11:35:17 +0000
committervodz <vodz@69ca8d6d-28ef-0310-b511-8ec308f3f277>2005-10-10 11:35:17 +0000
commit0d5aa005853e46d0eea77a3e19f065f2b7963848 (patch)
treebb326553f70f3bebe7ff3ed3cf1d57dcc8a5e8ab /e2fsprogs/ext2fs
parent5b39eeee4603692fe8d007f562ef7f8c0a328a2d (diff)
downloadbusybox-w32-0d5aa005853e46d0eea77a3e19f065f2b7963848.tar.gz
busybox-w32-0d5aa005853e46d0eea77a3e19f065f2b7963848.tar.bz2
busybox-w32-0d5aa005853e46d0eea77a3e19f065f2b7963848.zip
bb_mkdep: Rewroted. removed problem "include name must uniq", speed up * 3.
e2fsprogs: remove confuse bb_mkdep. Use internal e2fsprogs includes only. other: remove confuse bb_mkdep. git-svn-id: svn://busybox.net/trunk/busybox@11822 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'e2fsprogs/ext2fs')
-rw-r--r--e2fsprogs/ext2fs/bmove.c4
-rw-r--r--e2fsprogs/ext2fs/ext2_fs.h2
-rw-r--r--e2fsprogs/ext2fs/ext2fs.h18
-rw-r--r--e2fsprogs/ext2fs/ext2fs_inline.c4
-rw-r--r--e2fsprogs/ext2fs/mkjournal.c2
-rw-r--r--e2fsprogs/ext2fs/swapfs.c2
6 files changed, 9 insertions, 23 deletions
diff --git a/e2fsprogs/ext2fs/bmove.c b/e2fsprogs/ext2fs/bmove.c
index 7fc85a2c9..0b2ebb183 100644
--- a/e2fsprogs/ext2fs/bmove.c
+++ b/e2fsprogs/ext2fs/bmove.c
@@ -18,8 +18,8 @@
18#include <sys/time.h> 18#include <sys/time.h>
19#endif 19#endif
20 20
21#include "ext2fs/ext2_fs.h" 21#include "ext2_fs.h"
22#include "ext2fs/ext2fsP.h" 22#include "ext2fsP.h"
23 23
24struct process_block_struct { 24struct process_block_struct {
25 ext2_ino_t ino; 25 ext2_ino_t ino;
diff --git a/e2fsprogs/ext2fs/ext2_fs.h b/e2fsprogs/ext2fs/ext2_fs.h
index ff615c4bd..7a9890320 100644
--- a/e2fsprogs/ext2fs/ext2_fs.h
+++ b/e2fsprogs/ext2fs/ext2_fs.h
@@ -16,7 +16,7 @@
16#ifndef _LINUX_EXT2_FS_H 16#ifndef _LINUX_EXT2_FS_H
17#define _LINUX_EXT2_FS_H 17#define _LINUX_EXT2_FS_H
18 18
19#include <ext2fs/ext2_types.h> /* Changed from linux/types.h */ 19#include "ext2_types.h" /* Changed from linux/types.h */
20 20
21/* 21/*
22 * The second extended filesystem constants/structures 22 * The second extended filesystem constants/structures
diff --git a/e2fsprogs/ext2fs/ext2fs.h b/e2fsprogs/ext2fs/ext2fs.h
index bad2f9e58..eda962239 100644
--- a/e2fsprogs/ext2fs/ext2fs.h
+++ b/e2fsprogs/ext2fs/ext2fs.h
@@ -61,13 +61,8 @@ extern "C" {
61#include <stdio.h> 61#include <stdio.h>
62#include <stdlib.h> 62#include <stdlib.h>
63 63
64#if EXT2_FLAT_INCLUDES 64#include "ext2_types.h"
65#include "e2_types.h"
66#include "ext2_fs.h" 65#include "ext2_fs.h"
67#else
68#include <ext2fs/ext2_types.h>
69#include <ext2fs/ext2_fs.h>
70#endif /* EXT2_FLAT_INCLUDES */
71 66
72typedef __u32 ext2_ino_t; 67typedef __u32 ext2_ino_t;
73typedef __u32 blk_t; 68typedef __u32 blk_t;
@@ -76,13 +71,8 @@ typedef __u32 ext2_off_t;
76typedef __s64 e2_blkcnt_t; 71typedef __s64 e2_blkcnt_t;
77typedef __u32 ext2_dirhash_t; 72typedef __u32 ext2_dirhash_t;
78 73
79#if EXT2_FLAT_INCLUDES
80#include "ext2_io.h" 74#include "ext2_io.h"
81#include "ext2_err.h" 75#include "ext2_err.h"
82#else
83#include <ext2fs/ext2_io.h>
84#include <ext2fs/ext2_err.h>
85#endif
86 76
87/* 77/*
88 * Portability help for Microsoft Visual C++ 78 * Portability help for Microsoft Visual C++
@@ -243,11 +233,7 @@ struct struct_ext2_filsys {
243 io_channel image_io; 233 io_channel image_io;
244}; 234};
245 235
246#if EXT2_FLAT_INCLUDES 236#include "bitops.h"
247#include "e2_bitops.h"
248#else
249#include <ext2fs/bitops.h>
250#endif
251 237
252/* 238/*
253 * Return flags for the block iterator functions 239 * Return flags for the block iterator functions
diff --git a/e2fsprogs/ext2fs/ext2fs_inline.c b/e2fsprogs/ext2fs/ext2fs_inline.c
index d1d1b835a..f14e7b22f 100644
--- a/e2fsprogs/ext2fs/ext2fs_inline.c
+++ b/e2fsprogs/ext2fs/ext2fs_inline.c
@@ -9,8 +9,8 @@
9 * %End-Header% 9 * %End-Header%
10 */ 10 */
11 11
12#include "ext2fs/ext2fs.h" 12#include "ext2fs.h"
13#include "ext2fs/bitops.h" 13#include "bitops.h"
14 14
15/* 15/*
16 * Allocate memory 16 * Allocate memory
diff --git a/e2fsprogs/ext2fs/mkjournal.c b/e2fsprogs/ext2fs/mkjournal.c
index 427a08e72..b748918b6 100644
--- a/e2fsprogs/ext2fs/mkjournal.c
+++ b/e2fsprogs/ext2fs/mkjournal.c
@@ -33,7 +33,7 @@
33#endif 33#endif
34 34
35#include "ext2_fs.h" 35#include "ext2_fs.h"
36#include "e2p/e2p.h" 36#include "../e2p/e2p.h"
37#include "ext2fs.h" 37#include "ext2fs.h"
38#include "jfs_user.h" 38#include "jfs_user.h"
39 39
diff --git a/e2fsprogs/ext2fs/swapfs.c b/e2fsprogs/ext2fs/swapfs.c
index 908170129..8a0899515 100644
--- a/e2fsprogs/ext2fs/swapfs.c
+++ b/e2fsprogs/ext2fs/swapfs.c
@@ -18,7 +18,7 @@
18 18
19#include "ext2_fs.h" 19#include "ext2_fs.h"
20#include "ext2fs.h" 20#include "ext2fs.h"
21#include <ext2fs/ext2_ext_attr.h> 21#include "ext2_ext_attr.h"
22 22
23#ifdef EXT2FS_ENABLE_SWAPFS 23#ifdef EXT2FS_ENABLE_SWAPFS
24void ext2fs_swap_super(struct ext2_super_block * sb) 24void ext2fs_swap_super(struct ext2_super_block * sb)