diff options
| author | R. Bernstein <rocky@gnu.org> | 2012-09-24 21:34:26 -0400 |
|---|---|---|
| committer | R. Bernstein <rocky@gnu.org> | 2012-09-24 21:34:26 -0400 |
| commit | b2180ffe114221f7cb086c5693bc747b4b64e879 (patch) | |
| tree | 274e6013b9e4702e334199117151ce64446c8d70 | |
| parent | 096438ae2f68605b268f80a027a1880fcaf300f3 (diff) | |
Make bool be 8-bit. Rather switch than find where in ISO9660 there was a discrepency between stdbool and the type.h definition.
| -rw-r--r-- | include/cdio/types.h | 2 | ||||
| -rw-r--r-- | lib/iso9660/iso9660.c | 10 | ||||
| -rw-r--r-- | lib/iso9660/iso9660_private.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/include/cdio/types.h b/include/cdio/types.h index 7499884e..7f83a301 100644 --- a/include/cdio/types.h +++ b/include/cdio/types.h @@ -116,7 +116,7 @@ typedef uint8_t ubyte; #ifdef _Bool #define bool _Bool #else -#define bool int +#define bool unsigned char #endif #define true 1 #define false 0 diff --git a/lib/iso9660/iso9660.c b/lib/iso9660/iso9660.c index c55ed5cf..5b9d0575 100644 --- a/lib/iso9660/iso9660.c +++ b/lib/iso9660/iso9660.c @@ -36,19 +36,19 @@ const char ISO_STANDARD_ID[] = {'C', 'D', '0', '0', '1'}; #include <time.h> #include <ctype.h> #ifdef HAVE_STRING_H -#include <string.h> +# include <string.h> #endif #ifdef HAVE_STDIO_H -#include <stdio.h> +# include <stdio.h> #endif #ifdef HAVE_LIMITS_H -#include <limits.h> +# include <limits.h> #endif #ifdef HAVE_STDLIB_H -#include <stdlib.h> +# include <stdlib.h> #endif #ifdef HAVE_SYS_STAT_H -#include <sys/stat.h> +# include <sys/stat.h> #endif #ifdef HAVE_ERRNO_H diff --git a/lib/iso9660/iso9660_private.h b/lib/iso9660/iso9660_private.h index d891b060..c5e13935 100644 --- a/lib/iso9660/iso9660_private.h +++ b/lib/iso9660/iso9660_private.h @@ -30,12 +30,12 @@ # define __CDIO_CONFIG_H__ 1 #endif +#include <cdio/types.h> + #ifdef HAVE_STDBOOL_H # include <stdbool.h> #endif -#include <cdio/types.h> - #define ISO_VERSION 1 PRAGMA_BEGIN_PACKED |