---

yaml --- r: 37609 b: refs/heads/master c: 6e21828 h: refs/heads/master i: 37607: fa78717 v: v3
git-mirror · Oct 1, 2006 · ce586c3 · ce586c3
1 parent 6da3f22
commit ce586c3
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be5b7a8987f23281b146f22b13e2079f448c69c7
+refs/heads/master: 6e21828743247270d09a86756a0c11702500dbfb
diff --git a/trunk/drivers/block/DAC960.h b/trunk/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/trunk/drivers/media/video/cpia2/cpia2.h b/trunk/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/trunk/drivers/net/dgrs.c b/trunk/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/trunk/drivers/scsi/BusLogic.h b/trunk/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/trunk/include/linux/stddef.h b/trunk/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/trunk/include/linux/types.h b/trunk/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;
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,7 +71,7 @@ @@
       Define a Boolean data type.
     */
-    typedef enum { false, true } __attribute__ ((packed)) boolean;
+    typedef bool boolean;
     /*
@@ Expand Down @@