diff options
author | vodz <vodz@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2005-10-10 11:35:17 +0000 |
---|---|---|
committer | vodz <vodz@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2005-10-10 11:35:17 +0000 |
commit | 0d5aa005853e46d0eea77a3e19f065f2b7963848 (patch) | |
tree | bb326553f70f3bebe7ff3ed3cf1d57dcc8a5e8ab /e2fsprogs/blkid | |
parent | 5b39eeee4603692fe8d007f562ef7f8c0a328a2d (diff) | |
download | busybox-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/blkid')
-rw-r--r-- | e2fsprogs/blkid/blkidP.h | 5 | ||||
-rw-r--r-- | e2fsprogs/blkid/probe.c | 2 | ||||
-rw-r--r-- | e2fsprogs/blkid/read.c | 2 | ||||
-rw-r--r-- | e2fsprogs/blkid/version.c | 1 |
4 files changed, 4 insertions, 6 deletions
diff --git a/e2fsprogs/blkid/blkidP.h b/e2fsprogs/blkid/blkidP.h index 43b4f0f53..759dfcd87 100644 --- a/e2fsprogs/blkid/blkidP.h +++ b/e2fsprogs/blkid/blkidP.h | |||
@@ -16,9 +16,8 @@ | |||
16 | #include <sys/types.h> | 16 | #include <sys/types.h> |
17 | #include <stdio.h> | 17 | #include <stdio.h> |
18 | 18 | ||
19 | #include <blkid/blkid.h> | 19 | #include "blkid.h" |
20 | 20 | #include "list.h" | |
21 | #include <blkid/list.h> | ||
22 | 21 | ||
23 | #ifdef __GNUC__ | 22 | #ifdef __GNUC__ |
24 | #define __BLKID_ATTR(x) __attribute__(x) | 23 | #define __BLKID_ATTR(x) __attribute__(x) |
diff --git a/e2fsprogs/blkid/probe.c b/e2fsprogs/blkid/probe.c index 5ae88b1ac..9008dc85c 100644 --- a/e2fsprogs/blkid/probe.c +++ b/e2fsprogs/blkid/probe.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <errno.h> | 28 | #include <errno.h> |
29 | #endif | 29 | #endif |
30 | #include "blkidP.h" | 30 | #include "blkidP.h" |
31 | #include "uuid/uuid.h" | 31 | #include "../uuid/uuid.h" |
32 | #include "probe.h" | 32 | #include "probe.h" |
33 | 33 | ||
34 | /* | 34 | /* |
diff --git a/e2fsprogs/blkid/read.c b/e2fsprogs/blkid/read.c index 358554cb5..36292ab13 100644 --- a/e2fsprogs/blkid/read.c +++ b/e2fsprogs/blkid/read.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #endif | 23 | #endif |
24 | 24 | ||
25 | #include "blkidP.h" | 25 | #include "blkidP.h" |
26 | #include "uuid/uuid.h" | 26 | #include "../uuid/uuid.h" |
27 | 27 | ||
28 | #ifdef HAVE_STRTOULL | 28 | #ifdef HAVE_STRTOULL |
29 | #define __USE_ISOC9X | 29 | #define __USE_ISOC9X |
diff --git a/e2fsprogs/blkid/version.c b/e2fsprogs/blkid/version.c index 772291641..ea30d0c9f 100644 --- a/e2fsprogs/blkid/version.c +++ b/e2fsprogs/blkid/version.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <ctype.h> | 17 | #include <ctype.h> |
18 | 18 | ||
19 | #include "blkid.h" | 19 | #include "blkid.h" |
20 | #include "../../version.h" | ||
21 | 20 | ||
22 | static const char *lib_version = E2FSPROGS_VERSION; | 21 | static const char *lib_version = E2FSPROGS_VERSION; |
23 | static const char *lib_date = E2FSPROGS_DATE; | 22 | static const char *lib_date = E2FSPROGS_DATE; |