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)

1 files changed, 15 insertions, 15 deletions

diff --git a/source3/include/nameserv.h b/source3/include/nameserv.h
index 46ea68574e..46236970a6 100644
--- a/source3/include/nameserv.h
+++ b/source3/include/nameserv.h
@@ -271,14 +271,14 @@ struct work_record {
 	/* Announce info. */
 	time_t lastannounce_time;
 	int announce_interval;
-	BOOL    needannounce;
+	bool    needannounce;
 
 	/* Timeout time for this workgroup. 0 means permanent. */
 	time_t death_time;  
 
 	/* Election info */
-	BOOL    RunningElection;
-	BOOL    needelection;
+	bool    RunningElection;
+	bool    needelection;
 	int     ElectionCount;
 	uint32  ElectionCriterion;
 
@@ -398,7 +398,7 @@ struct response_record {
 	int    repeat_count;
 
 	/* Recursion protection. */
-	BOOL in_expiration_processing;
+	bool in_expiration_processing;
 };
 
 /* A subnet structure. It contains a list of workgroups and netbios names. */
@@ -427,8 +427,8 @@ struct subnet_record {
 	struct name_record     *namelist;   /* List of netbios names. */
 	struct response_record *responselist;  /* List of responses expected. */
 
-	BOOL namelist_changed;
-	BOOL work_changed;
+	bool namelist_changed;
+	bool work_changed;
 
 	struct in_addr bcast_ip;
 	struct in_addr mask_ip;
@@ -460,13 +460,13 @@ struct nmb_packet {
 	struct {
 		int name_trn_id;
 		int opcode;
-		BOOL response;
+		bool response;
 		struct {
-			BOOL bcast;
-			BOOL recursion_available;
-			BOOL recursion_desired;
-			BOOL trunc;
-			BOOL authoritative;
+			bool bcast;
+			bool recursion_available;
+			bool recursion_desired;
+			bool trunc;
+			bool authoritative;
 		} nm_flags;
 		int rcode;
 		int qdcount;
@@ -503,8 +503,8 @@ struct dgram_packet {
 		int msg_type;
 		struct {
 			enum node_type node_type;
-			BOOL first;
-			BOOL more;
+			bool first;
+			bool more;
 		} flags;
 		int dgm_id;
 		struct in_addr source_ip;
@@ -525,7 +525,7 @@ struct packet_struct
 {
 	struct packet_struct *next;
 	struct packet_struct *prev;
-	BOOL locked;
+	bool locked;
 	struct in_addr ip;
 	int port;
 	int fd;