Re: [RFC][PATCH] A generic boolean (version 6)

From: ricknu-0
Date: Wed Jul 26 2006 - 16:27:12 EST


The sixth "version".

Changes (since fifth):
* removed the #undef false/true and #define false/true from include/linux/stddef.h.

Signed-off-by: Richard Knutsson <ricknu-0@xxxxxxxxxxxxxx>

---

Have not found any (real) reason letting the cpp know about false/true. As I
said in the last version, the only reason seem to be for the userspace. Well, as
there is no program of my knowlage that needs it, they were removed.

As there seems to be little respons nowadays (I hope its because there isn't to
much to comment on and not because of bordom to this), I will likely send this
in as a real patch (hoping for inclusion) tomorrow.

And once again; thanks to you all for all the comments and suggestions.

/Richard


drivers/block/DAC960.h | 2 +-
drivers/media/video/cpia2/cpia2.h | 4 ----
drivers/net/dgrs.c | 1 -
drivers/scsi/BusLogic.h | 5 +----
include/linux/stddef.h | 5 +++++
include/linux/types.h | 2 ++
6 files changed, 9 insertions(+), 10 deletions(-)


diff --git a/drivers/block/DAC960.h b/drivers/block/DAC960.h
index a82f37f..f9217c3 100644
--- a/drivers/block/DAC960.h
+++ b/drivers/block/DAC960.h
@@ -71,7 +71,7 @@ #define DAC690_V2_PciDmaMask 0xfffffffff
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 c5ecb2b..8d2dfc1 100644
--- a/drivers/media/video/cpia2/cpia2.h
+++ b/drivers/media/video/cpia2/cpia2.h
@@ -50,10 +50,6 @@ #define CPIA2_PATCH_VER 0
/***
* 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 fa4f094..4dbc23d 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 9792e5a..d6d1d56 100644
--- a/drivers/scsi/BusLogic.h
+++ b/drivers/scsi/BusLogic.h
@@ -237,10 +237,7 @@ enum BusLogic_BIOS_DiskGeometryTranslati
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 b3a2cad..0382065 100644
--- a/include/linux/stddef.h
+++ b/include/linux/stddef.h
@@ -10,6 +10,11 @@ #else
#define NULL ((void *)0)
#endif

+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 3f23566..85cf587 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -90,6 +90,8 @@ #define _CADDR_T
typedef __kernel_caddr_t caddr_t;
#endif

+typedef _Bool bool;
+
/* bsd */
typedef unsigned char u_char;
typedef unsigned short u_short;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/