Browse Source

[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>
Richard Knutsson 18 years ago
parent
commit
6e21828743

+ 1 - 1
drivers/block/DAC960.h

@@ -71,7 +71,7 @@
   Define a Boolean data type.
   Define a Boolean data type.
 */
 */
 
 
-typedef enum { false, true } __attribute__ ((packed)) boolean;
+typedef bool boolean;
 
 
 
 
 /*
 /*

+ 0 - 4
drivers/media/video/cpia2/cpia2.h

@@ -50,10 +50,6 @@
 /***
 /***
  * Image defines
  * Image defines
  ***/
  ***/
-#ifndef true
-#define true 1
-#define false 0
-#endif
 
 
 /*  Misc constants */
 /*  Misc constants */
 #define ALLOW_CORRUPT 0		/* Causes collater to discard checksum */
 #define ALLOW_CORRUPT 0		/* Causes collater to discard checksum */

+ 0 - 1
drivers/net/dgrs.c

@@ -110,7 +110,6 @@ static char version[] __initdata =
  *	DGRS include files
  *	DGRS include files
  */
  */
 typedef unsigned char uchar;
 typedef unsigned char uchar;
-typedef unsigned int bool;
 #define vol volatile
 #define vol volatile
 
 
 #include "dgrs.h"
 #include "dgrs.h"

+ 1 - 4
drivers/scsi/BusLogic.h

@@ -237,10 +237,7 @@ enum BusLogic_BIOS_DiskGeometryTranslation {
   Define a Boolean data type.
   Define a Boolean data type.
 */
 */
 
 
-typedef enum {
-	false,
-	true
-} PACKED boolean;
+typedef bool boolean;
 
 
 /*
 /*
   Define a 10^18 Statistics Byte Counter data type.
   Define a 10^18 Statistics Byte Counter data type.

+ 6 - 0
include/linux/stddef.h

@@ -11,6 +11,12 @@
 #endif
 #endif
 
 
 #ifdef __KERNEL__
 #ifdef __KERNEL__
+
+enum {
+	false	= 0,
+	true	= 1
+};
+
 #undef offsetof
 #undef offsetof
 #ifdef __compiler_offsetof
 #ifdef __compiler_offsetof
 #define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER)
 #define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER)

+ 2 - 0
include/linux/types.h

@@ -33,6 +33,8 @@ typedef __kernel_clockid_t	clockid_t;
 typedef __kernel_mqd_t		mqd_t;
 typedef __kernel_mqd_t		mqd_t;
 
 
 #ifdef __KERNEL__
 #ifdef __KERNEL__
+typedef _Bool			bool;
+
 typedef __kernel_uid32_t	uid_t;
 typedef __kernel_uid32_t	uid_t;
 typedef __kernel_gid32_t	gid_t;
 typedef __kernel_gid32_t	gid_t;
 typedef __kernel_uid16_t        uid16_t;
 typedef __kernel_uid16_t        uid16_t;