diff options
| author | Bryan O'Sullivan <bos@serpentine.com> | 2003-06-10 04:28:46 +0000 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2003-06-10 04:28:46 +0000 |
| commit | 426623eb9cecff8c912057fd4c432e9b7cf217e6 (patch) | |
| tree | f057a00d30f1a60887a99f8ddd349b3b4dcd2492 | |
| parent | ffbf23cd3f42d03528bff4a254ac0187695561cb (diff) | |
| download | klibc-426623eb9cecff8c912057fd4c432e9b7cf217e6.tar.gz | |
Fix build with kernel 2.6.0-test7.klibc-0.81
| -rw-r--r-- | include/signal.h | 2 | ||||
| -rw-r--r-- | include/sys/mman.h | 2 | ||||
| -rw-r--r-- | include/sys/types.h | 2 | ||||
| -rw-r--r-- | klibc/include/signal.h | 2 | ||||
| -rw-r--r-- | klibc/include/sys/mman.h | 2 | ||||
| -rw-r--r-- | klibc/include/sys/types.h | 2 | ||||
| -rw-r--r-- | utils/fstype.c | 1 |
7 files changed, 7 insertions, 6 deletions
diff --git a/include/signal.h b/include/signal.h index 8b99573446119..ffd2beba439fd 100644 --- a/include/signal.h +++ b/include/signal.h @@ -9,7 +9,7 @@ #include <string.h> /* For memset() */ #include <limits.h> /* For LONG_BIT */ #include <sys/types.h> -#include <linux/signal.h> +#include <asm/signal.h> /* Some architectures don't define these */ #ifndef SA_RESETHAND diff --git a/include/sys/mman.h b/include/sys/mman.h index 0576841d2dc56..3d8a2f63c287c 100644 --- a/include/sys/mman.h +++ b/include/sys/mman.h @@ -7,7 +7,7 @@ #include <klibc/extern.h> #include <sys/types.h> -#include <linux/mman.h> +#include <asm/mman.h> #include <asm/page.h> /* For PAGE_SIZE */ #define MAP_FAILED ((void *)-1) diff --git a/include/sys/types.h b/include/sys/types.h index 85feeb2c0b997..a25873cc4b2ab 100644 --- a/include/sys/types.h +++ b/include/sys/types.h @@ -21,7 +21,7 @@ typedef ptrdiff_t ssize_t; #define _LINUX_TYPES_H typedef __kernel_fd_set fd_set; -typedef __kernel_dev_t dev_t; +typedef uint32_t dev_t; typedef __kernel_ino_t ino_t; typedef __kernel_mode_t mode_t; typedef __kernel_nlink_t nlink_t; diff --git a/klibc/include/signal.h b/klibc/include/signal.h index 8b99573446119..ffd2beba439fd 100644 --- a/klibc/include/signal.h +++ b/klibc/include/signal.h @@ -9,7 +9,7 @@ #include <string.h> /* For memset() */ #include <limits.h> /* For LONG_BIT */ #include <sys/types.h> -#include <linux/signal.h> +#include <asm/signal.h> /* Some architectures don't define these */ #ifndef SA_RESETHAND diff --git a/klibc/include/sys/mman.h b/klibc/include/sys/mman.h index 0576841d2dc56..3d8a2f63c287c 100644 --- a/klibc/include/sys/mman.h +++ b/klibc/include/sys/mman.h @@ -7,7 +7,7 @@ #include <klibc/extern.h> #include <sys/types.h> -#include <linux/mman.h> +#include <asm/mman.h> #include <asm/page.h> /* For PAGE_SIZE */ #define MAP_FAILED ((void *)-1) diff --git a/klibc/include/sys/types.h b/klibc/include/sys/types.h index 85feeb2c0b997..a25873cc4b2ab 100644 --- a/klibc/include/sys/types.h +++ b/klibc/include/sys/types.h @@ -21,7 +21,7 @@ typedef ptrdiff_t ssize_t; #define _LINUX_TYPES_H typedef __kernel_fd_set fd_set; -typedef __kernel_dev_t dev_t; +typedef uint32_t dev_t; typedef __kernel_ino_t ino_t; typedef __kernel_mode_t mode_t; typedef __kernel_nlink_t nlink_t; diff --git a/utils/fstype.c b/utils/fstype.c index 5cefc5c599413..bbc236af58cb6 100644 --- a/utils/fstype.c +++ b/utils/fstype.c @@ -21,6 +21,7 @@ #include <linux/romfs_fs.h> #include <linux/cramfs_fs.h> #include <linux/minix_fs.h> +#define _LINUX_EXT2_FS_SB #include <linux/ext2_fs.h> #include "ext3_fs.h" |