===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/dig/dig.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- src/usr.bin/dig/dig.h	2020/09/14 08:37:08	1.12
+++ src/usr.bin/dig/dig.h	2020/09/14 08:40:43	1.13
@@ -23,7 +23,6 @@
 
 #include <dst/dst.h>
 
-#include <isc/boolean.h>
 #include <isc/buffer.h>
 #include <isc/list.h>
 #include <isc/sockaddr.h>
@@ -76,7 +75,7 @@
 
 /*% The dig_lookup structure */
 struct dig_lookup {
-	isc_boolean_t
+	int
 		pending, /*%< Pending a successful answer */
 		waiting_connect,
 		doing_xfr,
@@ -118,8 +117,8 @@
 	dns_rdatatype_t rdtype;
 	dns_rdatatype_t qrdtype;
 	dns_rdataclass_t rdclass;
-	isc_boolean_t rdtypeset;
-	isc_boolean_t rdclassset;
+	int rdtypeset;
+	int rdclassset;
 	char name_space[BUFSIZE];
 	char oname_space[BUFSIZE];
 	isc_buffer_t namebuf;
@@ -160,7 +159,7 @@
 /*% The dig_query structure */
 struct dig_query {
 	dig_lookup_t *lookup;
-	isc_boolean_t waiting_connect,
+	int waiting_connect,
 		pending_free,
 		waiting_senddone,
 		first_pass,
@@ -174,7 +173,7 @@
 	uint32_t second_rr_serial;
 	uint32_t msg_count;
 	uint32_t rr_count;
-	isc_boolean_t ixfr_axfr;
+	int ixfr_axfr;
 	char *servname;
 	char *userarg;
 	isc_bufferlist_t sendlist,
@@ -221,7 +220,7 @@
 extern dig_searchlistlist_t search_list;
 extern unsigned int extrabytes;
 
-extern isc_boolean_t check_ra, have_ipv4, have_ipv6, specified_source,
+extern int check_ra, have_ipv4, have_ipv6, specified_source,
 	usesearch, showsearch, qr;
 extern in_port_t port;
 extern unsigned int timeout;
@@ -236,12 +235,12 @@
 extern dns_name_t *hmacname;
 extern unsigned int digestbits;
 extern dns_tsigkey_t *tsigkey;
-extern isc_boolean_t validated;
+extern int validated;
 extern isc_taskmgr_t *taskmgr;
 extern isc_task_t *global_task;
-extern isc_boolean_t free_now;
-extern isc_boolean_t debugging, debugtiming;
-extern isc_boolean_t keep_open;
+extern int free_now;
+extern int debugging, debugtiming;
+extern int keep_open;
 
 extern char *progname;
 extern int tries;
@@ -260,8 +259,8 @@
 getaddresses(dig_lookup_t *lookup, const char *host, isc_result_t *resultp);
 
 isc_result_t
-get_reverse(char *reverse, size_t len, char *value, isc_boolean_t ip6_int,
-	    isc_boolean_t strict);
+get_reverse(char *reverse, size_t len, char *value, int ip6_int,
+	    int strict);
 
 __dead void
 fatal(const char *format, ...)
@@ -273,7 +272,7 @@
 void
 check_result(isc_result_t result, const char *msg);
 
-isc_boolean_t
+int
 setup_lookup(dig_lookup_t *lookup);
 
 void
@@ -295,7 +294,7 @@
 setup_libs(void);
 
 void
-setup_system(isc_boolean_t ipv4only, isc_boolean_t ipv6only);
+setup_system(int ipv4only, int ipv6only);
 
 isc_result_t
 parse_netprefix(isc_sockaddr_t **sap, const char *value);
@@ -304,13 +303,13 @@
 parse_hmac(const char *hmacstr);
 
 dig_lookup_t *
-requeue_lookup(dig_lookup_t *lookold, isc_boolean_t servers);
+requeue_lookup(dig_lookup_t *lookold, int servers);
 
 dig_lookup_t *
 make_empty_lookup(void);
 
 dig_lookup_t *
-clone_lookup(dig_lookup_t *lookold, isc_boolean_t servers);
+clone_lookup(dig_lookup_t *lookold, int servers);
 
 dig_server_t *
 make_server(const char *servname, const char *userarg);
@@ -346,7 +345,7 @@
  */
 
 extern isc_result_t
-(*dighost_printmessage)(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers);
+(*dighost_printmessage)(dig_query_t *query, dns_message_t *msg, int headers);
 /*%<
  * Print the final result of the lookup.
  */
@@ -385,7 +384,7 @@
  * Call to supply new parameters for the next lookup
  */
 void
-dig_query_setup(isc_boolean_t, isc_boolean_t, int argc, char **argv);
+dig_query_setup(int, int, int argc, char **argv);
 
 /*%<
  * set the main application event cycle running