RIP BOOL. Convert BOOL -> bool. I found a few interesting

bugs in various places whilst doing this (places that assumed
BOOL == int). I also need to fix the Samba4 pidl generation
(next checkin).
Jeremy.
(This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f)

3 files changed, 6 insertions, 6 deletions

diff --git a/source3/librpc/ndr/libndr.h b/source3/librpc/ndr/libndr.h
index adf2c94e4a..4531293c7b 100644
--- a/source3/librpc/ndr/libndr.h
+++ b/source3/librpc/ndr/libndr.h
@@ -293,7 +293,7 @@ struct ndr_interface_call {
         ndr_push_flags_fn_t ndr_push;
         ndr_pull_flags_fn_t ndr_pull;
         ndr_print_function_t ndr_print;
-        BOOL async;
+        bool async;
 };
 
 struct ndr_interface_string_array {
diff --git a/source3/librpc/ndr/ndr.c b/source3/librpc/ndr/ndr.c
index e2b660dc2c..552545999b 100644
--- a/source3/librpc/ndr/ndr.c
+++ b/source3/librpc/ndr/ndr.c
@@ -535,7 +535,7 @@ NTSTATUS ndr_token_store(TALLOC_CTX *mem_ctx,
   retrieve a token from a ndr context, using cmp_fn to match the tokens
 */
 NTSTATUS ndr_token_retrieve_cmp_fn(struct ndr_token_list **list, const void *key, uint32_t *v,
-				   comparison_fn_t _cmp_fn, BOOL _remove_tok)
+				   comparison_fn_t _cmp_fn, bool _remove_tok)
 {
 	struct ndr_token_list *tok;
 	for (tok=*list;tok;tok=tok->next) {
diff --git a/source3/librpc/ndr/ndr_misc.c b/source3/librpc/ndr/ndr_misc.c
index e66a8b9a5d..e4bff83650 100644
--- a/source3/librpc/ndr/ndr_misc.c
+++ b/source3/librpc/ndr/ndr_misc.c
@@ -133,7 +133,7 @@ struct GUID GUID_zero(void)
  * see if a range of memory is all zero. A NULL pointer is considered
  * to be all zero 
  */
-BOOL all_zero(const uint8_t *ptr, size_t size)
+bool all_zero(const uint8_t *ptr, size_t size)
 {
 	int i;
 	if (!ptr) return True;
@@ -144,7 +144,7 @@ BOOL all_zero(const uint8_t *ptr, size_t size)
 }
 
 
-BOOL GUID_all_zero(const struct GUID *u)
+bool GUID_all_zero(const struct GUID *u)
 {
 	if (u->time_low != 0 ||
 	    u->time_mid != 0 ||
@@ -157,7 +157,7 @@ BOOL GUID_all_zero(const struct GUID *u)
 	return True;
 }
 
-BOOL GUID_equal(const struct GUID *u1, const struct GUID *u2)
+bool GUID_equal(const struct GUID *u1, const struct GUID *u2)
 {
 	if (u1->time_low != u2->time_low ||
 	    u1->time_mid != u2->time_mid ||
@@ -199,7 +199,7 @@ void ndr_print_GUID(struct ndr_print *ndr, const char *name, const struct GUID *
 	ndr->print(ndr, "%-25s: %s", name, GUID_string(ndr, guid));
 }
 
-BOOL policy_handle_empty(struct policy_handle *h) 
+bool policy_handle_empty(struct policy_handle *h) 
 {
 	return (h->handle_type == 0 && GUID_all_zero(&h->uuid));
 }