diff options
| author | Richard Knutsson <ricknu-0@student.ltu.se> | 2006-09-30 23:27:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 00:39:18 -0700 |
| commit | 6e21828743247270d09a86756a0c11702500dbfb (patch) | |
| tree | e38e37a5040801787e8e942ba35c25903cea0d77 | |
| parent | be5b7a8987f23281b146f22b13e2079f448c69c7 (diff) | |
| download | linux-6e21828743247270d09a86756a0c11702500dbfb.tar.gz | |
[PATCH] Generic boolean
This patch defines:
* a generic boolean-type, named 'bool'
* aliases to 0 and 1, named 'false' and 'true'
Removing colliding definitions of 'bool', 'false' and 'true'.
Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/block/DAC960.h | 2 | ||||
| -rw-r--r-- | drivers/media/video/cpia2/cpia2.h | 4 | ||||
| -rw-r--r-- | drivers/net/dgrs.c | 1 | ||||
| -rw-r--r-- | drivers/scsi/BusLogic.h | 5 | ||||
| -rw-r--r-- | include/linux/stddef.h | 6 | ||||
| -rw-r--r-- | include/linux/types.h | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/drivers/block/DAC960.h b/drivers/block/DAC960.h index a82f37f749a5c2..f9217c34bc2bb2 100644 --- a/drivers/block/DAC960.h +++ b/drivers/block/DAC960.h @@ -71,7 +71,7 @@ Define a Boolean data type. */ -typedef enum { false, true } __attribute__ ((packed)) boolean; +typedef bool boolean; /* diff --git a/drivers/media/video/cpia2/cpia2.h b/drivers/media/video/cpia2/cpia2.h index c5ecb2be5f9313..8d2dfc128821ab 100644 --- a/drivers/media/video/cpia2/cpia2.h +++ b/drivers/media/video/cpia2/cpia2.h @@ -50,10 +50,6 @@ /*** * Image defines ***/ -#ifndef true -#define true 1 -#define false 0 -#endif /* Misc constants */ #define ALLOW_CORRUPT 0 /* Causes collater to discard checksum */ diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c index e9361cb5f4cd44..d0842527b36947 100644 --- a/drivers/net/dgrs.c +++ b/drivers/net/dgrs.c @@ -110,7 +110,6 @@ static char version[] __initdata = * DGRS include files */ typedef unsigned char uchar; -typedef unsigned int bool; #define vol volatile #include "dgrs.h" diff --git a/drivers/scsi/BusLogic.h b/drivers/scsi/BusLogic.h index 9792e5af5252c4..d6d1d5613c8aa9 100644 --- a/drivers/scsi/BusLogic.h +++ b/drivers/scsi/BusLogic.h @@ -237,10 +237,7 @@ enum BusLogic_BIOS_DiskGeometryTranslation { Define a Boolean data type. */ -typedef enum { - false, - true -} PACKED boolean; +typedef bool boolean; /* Define a 10^18 Statistics Byte Counter data type. diff --git a/include/linux/stddef.h b/include/linux/stddef.h index ea65dfb60cd80e..6a40c76bdcf1a7 100644 --- a/include/linux/stddef.h +++ b/include/linux/stddef.h @@ -11,6 +11,12 @@ #endif #ifdef __KERNEL__ + +enum { + false = 0, + true = 1 +}; + #undef offsetof #ifdef __compiler_offsetof #define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER) diff --git a/include/linux/types.h b/include/linux/types.h index 3f235660a3cd6a..406d4ae5763170 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -33,6 +33,8 @@ typedef __kernel_clockid_t clockid_t; typedef __kernel_mqd_t mqd_t; #ifdef __KERNEL__ +typedef _Bool bool; + typedef __kernel_uid32_t uid_t; typedef __kernel_gid32_t gid_t; typedef __kernel_uid16_t uid16_t; |