diff options
Diffstat (limited to 'src/h-type.h')
| -rw-r--r-- | src/h-type.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/h-type.h b/src/h-type.h index eb865892..5dbb4975 100644 --- a/src/h-type.h +++ b/src/h-type.h @@ -78,13 +78,6 @@ typedef int errr; #undef byte #define byte byte_hack -/* - * Hack -- prevent problems with C++ - */ -#undef bool -#define bool bool_hack - - /* Note that "signed char" is not always "defined" */ /* So always use "s16b" to hold small signed values */ /* A signed byte of memory */ @@ -96,7 +89,7 @@ typedef unsigned char byte; /* Note that a bool is smaller than a full "int" */ /* Simple True/False type */ -typedef char bool; +typedef char bool_; /* A signed, standard integer (at least 2 bytes) */ @@ -133,7 +126,7 @@ typedef real *real_ptr; typedef errr *errr_ptr; typedef char *char_ptr; typedef byte *byte_ptr; -typedef bool *bool_ptr; +typedef bool_ *bool_ptr; typedef sint *sint_ptr; typedef uint *uint_ptr; typedef long *long_ptr; @@ -153,7 +146,7 @@ typedef void (*func_void)(); typedef errr (*func_errr)(); typedef char (*func_char)(); typedef byte (*func_byte)(); -typedef bool (*func_bool)(); +typedef bool_ (*func_bool)(); typedef sint (*func_sint)(); typedef uint (*func_uint)(); typedef real (*func_real)(); @@ -168,7 +161,7 @@ typedef cptr (*func_cptr)(); typedef errr (*func_gen)(vptr, vptr); /* An equality testing function takes two things to compare (bool) */ -typedef bool (*func_eql)(vptr, vptr); +typedef bool_ (*func_eql)(vptr, vptr); /* A comparison function takes two things and to compare (-1,0,+1) */ typedef sint (*func_cmp)(vptr, vptr); |