Commit 6e218287 authored by Richard Knutsson's avatar Richard Knutsson Committed by Linus Torvalds

[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: default avatarRichard Knutsson <ricknu-0@student.ltu.se>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent be5b7a89
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
Define a Boolean data type. Define a Boolean data type.
*/ */
typedef enum { false, true } __attribute__ ((packed)) boolean; typedef bool boolean;
/* /*
......
...@@ -50,10 +50,6 @@ ...@@ -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 */
......
...@@ -110,7 +110,6 @@ static char version[] __initdata = ...@@ -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"
......
...@@ -237,10 +237,7 @@ enum BusLogic_BIOS_DiskGeometryTranslation { ...@@ -237,10 +237,7 @@ enum BusLogic_BIOS_DiskGeometryTranslation {
Define a Boolean data type. Define a Boolean data type.
*/ */
typedef enum { typedef bool boolean;
false,
true
} PACKED boolean;
/* /*
Define a 10^18 Statistics Byte Counter data type. Define a 10^18 Statistics Byte Counter data type.
......
...@@ -11,6 +11,12 @@ ...@@ -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)
......
...@@ -33,6 +33,8 @@ typedef __kernel_clockid_t clockid_t; ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment