Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

drivers/block/DAC960.h

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
  Define a Boolean data type.

*/



typedef enum { false, true } __attribute__ ((packed)) boolean;

typedef bool boolean;





/*

drivers/media/video/cpia2/cpia2.h

+0 −4
Original line number Diff line number Diff line
@@ -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 */

drivers/net/dgrs.c

+0 −1
Original line number Diff line number Diff line
@@ -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"

drivers/scsi/BusLogic.h

+1 −4
Original line number Diff line number Diff line
@@ -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.

include/linux/stddef.h

+6 −0
Original line number Diff line number Diff line
@@ -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)