diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2011-02-20 19:54:40 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2011-02-20 20:56:41 +0100 |
| commit | 5fbe06613a8a9e5d8731a832ddff0e9bdce112bb (patch) | |
| tree | 4ab5267304509feed1bbcf4ad265cd8597c64fce /src/z-util.c | |
| parent | 420428c53fe83064331ac2e06297c8a93abc93cf (diff) | |
Remove redefinition of "bool" for C++ friendliness.
Diffstat (limited to 'src/z-util.c')
| -rw-r--r-- | src/z-util.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/z-util.c b/src/z-util.c index f0842b07..76120833 100644 --- a/src/z-util.c +++ b/src/z-util.c @@ -30,12 +30,12 @@ vptr vptr_tmp = NULL; /* * Constant bool meaning true */ -bool bool_true = 1; +bool_ bool_true = 1; /* * Constant bool meaning false */ -bool bool_false = 0; +bool_ bool_false = 0; /* @@ -105,7 +105,7 @@ errr func_failure(void) /* * A routine that always returns "true" */ -bool func_true(void) +bool_ func_true(void) { return (1); } @@ -114,7 +114,7 @@ bool func_true(void) /* * A routine that always returns "false" */ -bool func_false(void) +bool_ func_false(void) { return (0); } @@ -125,7 +125,7 @@ bool func_false(void) /* * Determine if string "t" is equal to string "t" */ -bool streq(cptr a, cptr b) +bool_ streq(cptr a, cptr b) { return (!strcmp(a, b)); } @@ -134,7 +134,7 @@ bool streq(cptr a, cptr b) /* * Determine if string "t" is a suffix of string "s" */ -bool suffix(cptr s, cptr t) +bool_ suffix(cptr s, cptr t) { int tlen = strlen(t); int slen = strlen(s); |