[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>

diff --git a/drivers/block/DAC960.h b/drivers/block/DAC960.h
index a82f37f749a5c2e265dd96c4d2abb88e84a7d329..f9217c34bc2bb2cbf200f2d4a3f3eb486de11cf0 100644 (file)
--- 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 c5ecb2be5f9313d692f0c9826e6202f2b64c357b..8d2dfc128821ab57703689fbb7ed1671e04bd432 100644 (file)
--- 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 e9361cb5f4cd44297ab0ed0fbe99f050333d9360..d0842527b3694782ebdcbde85e21e5ad95f55193 100644 (file)
--- 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 9792e5af5252c4a6378490667fe64f5318c64dac..d6d1d5613c8aa9e6a207204cdd0127112a548761 100644 (file)
--- 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 ea65dfb60cd80e19d2a5a1ce9a5f00194017e4c0..6a40c76bdcf1a7732d71675d888e722aa0dc578c 100644 (file)
--- 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 3f235660a3cd6a76c4fa0480e649deaa5a4077d3..406d4ae57631709542ad5097b1aba9216fa2a4c3 100644 (file)
--- 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;