s4-waf: rebuild signature files with the api type maps

This is not strictly necessary, as the old types would compare equal,
but it is neater to use the generic type names

5 files changed, 55 insertions, 55 deletions

diff --git a/lib/talloc/ABI/talloc-2.0.2.sigs b/lib/talloc/ABI/talloc-2.0.2.sigs
index 310a57daff..b244fc1b8c 100644
--- a/lib/talloc/ABI/talloc-2.0.2.sigs
+++ b/lib/talloc/ABI/talloc-2.0.2.sigs
@@ -55,8 +55,8 @@ talloc_strndup_append_buffer: char *(char *, const char *, size_t)
 talloc_total_blocks: size_t (const void *)
 talloc_total_size: size_t (const void *)
 talloc_unlink: int (const void *, void *)
-talloc_vasprintf: char *(const void *, const char *, struct __va_list_tag *)
-talloc_vasprintf_append: char *(char *, const char *, struct __va_list_tag *)
-talloc_vasprintf_append_buffer: char *(char *, const char *, struct __va_list_tag *)
+talloc_vasprintf: char *(const void *, const char *, struct va_list *)
+talloc_vasprintf_append: char *(char *, const char *, struct va_list *)
+talloc_vasprintf_append_buffer: char *(char *, const char *, struct va_list *)
 talloc_version_major: int (void)
 talloc_version_minor: int (void)
diff --git a/lib/tdb/ABI/tdb-1.2.1.sigs b/lib/tdb/ABI/tdb-1.2.1.sigs
index 3cd9d31ce3..84f200745e 100644
--- a/lib/tdb/ABI/tdb-1.2.1.sigs
+++ b/lib/tdb/ABI/tdb-1.2.1.sigs
@@ -1,8 +1,8 @@
 tdb_add_flags: void (struct tdb_context *, unsigned int)
 tdb_alloc_read: unsigned char *(struct tdb_context *, tdb_off_t, tdb_len_t)
 tdb_allocate: tdb_off_t (struct tdb_context *, tdb_len_t, struct tdb_record *)
-tdb_allrecord_lock: int (struct tdb_context *, int, enum tdb_lock_flags, _Bool)
-tdb_allrecord_unlock: int (struct tdb_context *, int, _Bool)
+tdb_allrecord_lock: int (struct tdb_context *, int, enum tdb_lock_flags, bool)
+tdb_allrecord_unlock: int (struct tdb_context *, int, bool)
 tdb_allrecord_upgrade: int (struct tdb_context *)
 tdb_append: int (struct tdb_context *, TDB_DATA, TDB_DATA)
 tdb_brlock: int (struct tdb_context *, int, tdb_off_t, size_t, enum tdb_lock_flags)
@@ -35,7 +35,7 @@ tdb_get_flags: int (struct tdb_context *)
 tdb_get_logging_private: void *(struct tdb_context *)
 tdb_get_seqnum: int (struct tdb_context *)
 tdb_hash_size: int (struct tdb_context *)
-tdb_have_extra_locks: _Bool (struct tdb_context *)
+tdb_have_extra_locks: bool (struct tdb_context *)
 tdb_increment_seqnum_nonblock: void (struct tdb_context *)
 tdb_io_init: void (struct tdb_context *)
 tdb_lock: int (struct tdb_context *, int, int)
@@ -52,9 +52,9 @@ tdb_map_size: size_t (struct tdb_context *)
 tdb_mmap: void (struct tdb_context *)
 tdb_munmap: int (struct tdb_context *)
 tdb_name: const char *(struct tdb_context *)
-tdb_needs_recovery: _Bool (struct tdb_context *)
+tdb_needs_recovery: bool (struct tdb_context *)
 tdb_nest_lock: int (struct tdb_context *, uint32_t, int, enum tdb_lock_flags)
-tdb_nest_unlock: int (struct tdb_context *, uint32_t, int, _Bool)
+tdb_nest_unlock: int (struct tdb_context *, uint32_t, int, bool)
 tdb_nextkey: TDB_DATA (struct tdb_context *, TDB_DATA)
 tdb_ofs_read: int (struct tdb_context *, tdb_off_t, tdb_off_t *)
 tdb_ofs_write: int (struct tdb_context *, tdb_off_t, tdb_off_t *)
diff --git a/lib/tevent/ABI/tevent-0.9.9.sigs b/lib/tevent/ABI/tevent-0.9.9.sigs
index ec2926b34d..9c9c7f98f3 100644
--- a/lib/tevent/ABI/tevent-0.9.9.sigs
+++ b/lib/tevent/ABI/tevent-0.9.9.sigs
@@ -3,16 +3,16 @@ _tevent_add_signal: struct tevent_signal *(struct tevent_context *, TALLOC_CTX *
 _tevent_add_timer: struct tevent_timer *(struct tevent_context *, TALLOC_CTX *, struct timeval, tevent_timer_handler_t, void *, const char *, const char *)
 _tevent_create_immediate: struct tevent_immediate *(TALLOC_CTX *, const char *)
 _tevent_loop_once: int (struct tevent_context *, const char *)
-_tevent_loop_until: int (struct tevent_context *, _Bool (*)(void *), void *, const char *)
+_tevent_loop_until: int (struct tevent_context *, bool (*)(void *), void *, const char *)
 _tevent_loop_wait: int (struct tevent_context *, const char *)
 _tevent_queue_create: struct tevent_queue *(TALLOC_CTX *, const char *, const char *)
 _tevent_req_callback_data: void *(struct tevent_req *)
-_tevent_req_cancel: _Bool (struct tevent_req *, const char *)
+_tevent_req_cancel: bool (struct tevent_req *, const char *)
 _tevent_req_create: struct tevent_req *(TALLOC_CTX *, void *, size_t, const char *, const char *)
 _tevent_req_data: void *(struct tevent_req *)
 _tevent_req_done: void (struct tevent_req *, const char *)
-_tevent_req_error: _Bool (struct tevent_req *, uint64_t, const char *)
-_tevent_req_nomem: _Bool (const void *, struct tevent_req *, const char *)
+_tevent_req_error: bool (struct tevent_req *, uint64_t, const char *)
+_tevent_req_nomem: bool (const void *, struct tevent_req *, const char *)
 _tevent_req_notify_callback: void (struct tevent_req *, const char *)
 _tevent_schedule_immediate: void (struct tevent_immediate *, struct tevent_context *, tevent_immediate_handler_t, void *, const char *, const char *)
 tevent_backend_list: const char **(TALLOC_CTX *)
@@ -26,7 +26,7 @@ tevent_common_fd_destructor: int (struct tevent_fd *)
 tevent_common_fd_get_flags: uint16_t (struct tevent_fd *)
 tevent_common_fd_set_close_fn: void (struct tevent_fd *, tevent_fd_close_fn_t)
 tevent_common_fd_set_flags: void (struct tevent_fd *, uint16_t)
-tevent_common_loop_immediate: _Bool (struct tevent_context *)
+tevent_common_loop_immediate: bool (struct tevent_context *)
 tevent_common_loop_timer_delay: struct timeval (struct tevent_context *)
 tevent_common_loop_wait: int (struct tevent_context *, const char *)
 tevent_common_schedule_immediate: void (struct tevent_immediate *, struct tevent_context *, tevent_immediate_handler_t, void *, const char *, const char *)
@@ -39,35 +39,35 @@ tevent_fd_set_close_fn: void (struct tevent_fd *, tevent_fd_close_fn_t)
 tevent_fd_set_flags: void (struct tevent_fd *, uint16_t)
 tevent_loop_allow_nesting: void (struct tevent_context *)
 tevent_loop_set_nesting_hook: void (struct tevent_context *, tevent_nesting_hook, void *)
-tevent_queue_add: _Bool (struct tevent_queue *, struct tevent_context *, struct tevent_req *, tevent_queue_trigger_fn_t, void *)
+tevent_queue_add: bool (struct tevent_queue *, struct tevent_context *, struct tevent_req *, tevent_queue_trigger_fn_t, void *)
 tevent_queue_length: size_t (struct tevent_queue *)
 tevent_queue_start: void (struct tevent_queue *)
 tevent_queue_stop: void (struct tevent_queue *)
 tevent_re_initialise: int (struct tevent_context *)
-tevent_register_backend: _Bool (const char *, const struct tevent_ops *)
+tevent_register_backend: bool (const char *, const struct tevent_ops *)
 tevent_req_default_print: char *(struct tevent_req *, TALLOC_CTX *)
-tevent_req_is_error: _Bool (struct tevent_req *, enum tevent_req_state *, uint64_t *)
-tevent_req_is_in_progress: _Bool (struct tevent_req *)
-tevent_req_poll: _Bool (struct tevent_req *, struct tevent_context *)
+tevent_req_is_error: bool (struct tevent_req *, enum tevent_req_state *, uint64_t *)
+tevent_req_is_in_progress: bool (struct tevent_req *)
+tevent_req_poll: bool (struct tevent_req *, struct tevent_context *)
 tevent_req_post: struct tevent_req *(struct tevent_req *, struct tevent_context *)
 tevent_req_print: char *(TALLOC_CTX *, struct tevent_req *)
 tevent_req_received: void (struct tevent_req *)
 tevent_req_set_callback: void (struct tevent_req *, tevent_req_fn, void *)
 tevent_req_set_cancel_fn: void (struct tevent_req *, tevent_req_cancel_fn)
-tevent_req_set_endtime: _Bool (struct tevent_req *, struct tevent_context *, struct timeval)
+tevent_req_set_endtime: bool (struct tevent_req *, struct tevent_context *, struct timeval)
 tevent_req_set_print_fn: void (struct tevent_req *, tevent_req_print_fn)
 tevent_set_abort_fn: void (void (*)(const char *))
-tevent_set_debug: int (struct tevent_context *, void (*)(void *, enum tevent_debug_level, const char *, struct __va_list_tag *), void *)
+tevent_set_debug: int (struct tevent_context *, void (*)(void *, enum tevent_debug_level, const char *, struct va_list *), void *)
 tevent_set_debug_stderr: int (struct tevent_context *)
 tevent_set_default_backend: void (const char *)
-tevent_signal_support: _Bool (struct tevent_context *)
+tevent_signal_support: bool (struct tevent_context *)
 tevent_timeval_add: struct timeval (const struct timeval *, uint32_t, uint32_t)
 tevent_timeval_compare: int (const struct timeval *, const struct timeval *)
 tevent_timeval_current: struct timeval (void)
 tevent_timeval_current_ofs: struct timeval (uint32_t, uint32_t)
-tevent_timeval_is_zero: _Bool (const struct timeval *)
+tevent_timeval_is_zero: bool (const struct timeval *)
 tevent_timeval_set: struct timeval (uint32_t, uint32_t)
 tevent_timeval_until: struct timeval (const struct timeval *, const struct timeval *)
 tevent_timeval_zero: struct timeval (void)
-tevent_wakeup_recv: _Bool (struct tevent_req *)
+tevent_wakeup_recv: bool (struct tevent_req *)
 tevent_wakeup_send: struct tevent_req *(TALLOC_CTX *, struct tevent_context *, struct timeval)
diff --git a/source4/lib/ldb/ABI/ldb-0.9.10.sigs b/source4/lib/ldb/ABI/ldb-0.9.10.sigs
index 60c95a94a1..20d8bb80d1 100644
--- a/source4/lib/ldb/ABI/ldb-0.9.10.sigs
+++ b/source4/lib/ldb/ABI/ldb-0.9.10.sigs
@@ -30,16 +30,16 @@ ldb_debug_add: void (struct ldb_context *, const char *, ...)
 ldb_debug_end: void (struct ldb_context *, enum ldb_debug_level)
 ldb_debug_set: void (struct ldb_context *, enum ldb_debug_level, const char *, ...)
 ldb_delete: int (struct ldb_context *, struct ldb_dn *)
-ldb_dn_add_base: _Bool (struct ldb_dn *, struct ldb_dn *)
-ldb_dn_add_base_fmt: _Bool (struct ldb_dn *, const char *, ...)
-ldb_dn_add_child: _Bool (struct ldb_dn *, struct ldb_dn *)
-ldb_dn_add_child_fmt: _Bool (struct ldb_dn *, const char *, ...)
+ldb_dn_add_base: bool (struct ldb_dn *, struct ldb_dn *)
+ldb_dn_add_base_fmt: bool (struct ldb_dn *, const char *, ...)
+ldb_dn_add_child: bool (struct ldb_dn *, struct ldb_dn *)
+ldb_dn_add_child_fmt: bool (struct ldb_dn *, const char *, ...)
 ldb_dn_alloc_casefold: char *(void *, struct ldb_dn *)
 ldb_dn_alloc_linearized: char *(void *, struct ldb_dn *)
 ldb_dn_canonical_ex_string: char *(void *, struct ldb_dn *)
 ldb_dn_canonical_string: char *(void *, struct ldb_dn *)
-ldb_dn_check_local: _Bool (struct ldb_module *, struct ldb_dn *)
-ldb_dn_check_special: _Bool (struct ldb_dn *, const char *)
+ldb_dn_check_local: bool (struct ldb_module *, struct ldb_dn *)
+ldb_dn_check_special: bool (struct ldb_dn *, const char *)
 ldb_dn_compare: int (struct ldb_dn *, struct ldb_dn *)
 ldb_dn_compare_base: int (struct ldb_dn *, struct ldb_dn *)
 ldb_dn_copy: struct ldb_dn *(void *, struct ldb_dn *)
@@ -58,22 +58,22 @@ ldb_dn_get_linearized: const char *(struct ldb_dn *)
 ldb_dn_get_parent: struct ldb_dn *(void *, struct ldb_dn *)
 ldb_dn_get_rdn_name: const char *(struct ldb_dn *)
 ldb_dn_get_rdn_val: const struct ldb_val *(struct ldb_dn *)
-ldb_dn_has_extended: _Bool (struct ldb_dn *)
-ldb_dn_is_null: _Bool (struct ldb_dn *)
-ldb_dn_is_special: _Bool (struct ldb_dn *)
-ldb_dn_is_valid: _Bool (struct ldb_dn *)
+ldb_dn_has_extended: bool (struct ldb_dn *)
+ldb_dn_is_null: bool (struct ldb_dn *)
+ldb_dn_is_special: bool (struct ldb_dn *)
+ldb_dn_is_valid: bool (struct ldb_dn *)
 ldb_dn_map_local: struct ldb_dn *(struct ldb_module *, void *, struct ldb_dn *)
 ldb_dn_map_rebase_remote: struct ldb_dn *(struct ldb_module *, void *, struct ldb_dn *)
 ldb_dn_map_remote: struct ldb_dn *(struct ldb_module *, void *, struct ldb_dn *)
 ldb_dn_new: struct ldb_dn *(void *, struct ldb_context *, const char *)
 ldb_dn_new_fmt: struct ldb_dn *(void *, struct ldb_context *, const char *, ...)
-ldb_dn_remove_base_components: _Bool (struct ldb_dn *, unsigned int)
-ldb_dn_remove_child_components: _Bool (struct ldb_dn *, unsigned int)
+ldb_dn_remove_base_components: bool (struct ldb_dn *, unsigned int)
+ldb_dn_remove_child_components: bool (struct ldb_dn *, unsigned int)
 ldb_dn_remove_extended_components: void (struct ldb_dn *)
 ldb_dn_set_component: int (struct ldb_dn *, int, const char *, const struct ldb_val)
 ldb_dn_set_extended_component: int (struct ldb_dn *, const char *, const struct ldb_val *)
 ldb_dn_update_components: int (struct ldb_dn *, const struct ldb_dn *)
-ldb_dn_validate: _Bool (struct ldb_dn *)
+ldb_dn_validate: bool (struct ldb_dn *)
 ldb_dump_results: void (struct ldb_context *, struct ldb_result *, FILE *)
 ldb_errstring: const char *(struct ldb_context *)
 ldb_extended: int (struct ldb_context *, const char *, void *, struct ldb_result **)
@@ -172,10 +172,10 @@ ldb_rdn_name_module_ops: name = 0xXXXX "rdn_name", init_context = 0, search = 0,
 ldb_register_backend: int (const char *, ldb_connect_fn)
 ldb_register_module: int (const struct ldb_module_ops *)
 ldb_rename: int (struct ldb_context *, struct ldb_dn *, struct ldb_dn *)
-ldb_reply_add_control: int (struct ldb_reply *, const char *, _Bool, void *)
+ldb_reply_add_control: int (struct ldb_reply *, const char *, bool, void *)
 ldb_reply_get_control: struct ldb_control *(struct ldb_reply *, const char *)
 ldb_request: int (struct ldb_context *, struct ldb_request *)
-ldb_request_add_control: int (struct ldb_request *, const char *, _Bool, void *)
+ldb_request_add_control: int (struct ldb_request *, const char *, bool, void *)
 ldb_request_done: int (struct ldb_request *, int)
 ldb_request_get_control: struct ldb_control *(struct ldb_request *, const char *)
 ldb_request_get_status: int (struct ldb_request *)
@@ -192,7 +192,7 @@ ldb_search_default_callback: int (struct ldb_request *, struct ldb_reply *)
 ldb_sequence_number: int (struct ldb_context *, enum ldb_sequence_type, uint64_t *)
 ldb_server_sort_module_ops: name = 0xXXXX "server_sort", init_context = 0xXXXX <server_sort_init>, search = 0xXXXX <server_sort_search>, add = 0, modify = 0, del = 0, rename = 0, request = 0, extended = 0, start_transaction = 0, prepare_commit = 0, end_transaction = 0, del_transaction = 0, sequence_number = 0, private_data = 0xXXXX
 ldb_set_create_perms: void (struct ldb_context *, unsigned int)
-ldb_set_debug: int (struct ldb_context *, void (*)(void *, enum ldb_debug_level, const char *, struct __va_list_tag *), void *)
+ldb_set_debug: int (struct ldb_context *, void (*)(void *, enum ldb_debug_level, const char *, struct va_list *), void *)
 ldb_set_debug_stderr: int (struct ldb_context *)
 ldb_set_default_dns: void (struct ldb_context *)
 ldb_set_errstring: void (struct ldb_context *, const char *)
diff --git a/source4/lib/ldb/ABI/ldb-samba4-0.9.10.sigs b/source4/lib/ldb/ABI/ldb-samba4-0.9.10.sigs
index fe28425ecb..c5a920115d 100644
--- a/source4/lib/ldb/ABI/ldb-samba4-0.9.10.sigs
+++ b/source4/lib/ldb/ABI/ldb-samba4-0.9.10.sigs
@@ -33,16 +33,16 @@ ldb_debug_end: void (struct ldb_context *, enum ldb_debug_level)
 ldb_debug_set: void (struct ldb_context *, enum ldb_debug_level, const char *, ...)
 ldb_delete: int (struct ldb_context *, struct ldb_dn *)
 ldb_descriptor_module_ops: name = 0xXXXX "descriptor", init_context = 0xXXXX <descriptor_init>, search = 0xXXXX <descriptor_search>, add = 0xXXXX <descriptor_change>, modify = 0xXXXX <descriptor_change>, del = 0, rename = 0xXXXX <descriptor_rename>, request = 0, extended = 0, start_transaction = 0, prepare_commit = 0, end_transaction = 0, del_transaction = 0, sequence_number = 0, private_data = 0xXXXX
-ldb_dn_add_base: _Bool (struct ldb_dn *, struct ldb_dn *)
-ldb_dn_add_base_fmt: _Bool (struct ldb_dn *, const char *, ...)
-ldb_dn_add_child: _Bool (struct ldb_dn *, struct ldb_dn *)
-ldb_dn_add_child_fmt: _Bool (struct ldb_dn *, const char *, ...)
+ldb_dn_add_base: bool (struct ldb_dn *, struct ldb_dn *)
+ldb_dn_add_base_fmt: bool (struct ldb_dn *, const char *, ...)
+ldb_dn_add_child: bool (struct ldb_dn *, struct ldb_dn *)
+ldb_dn_add_child_fmt: bool (struct ldb_dn *, const char *, ...)
 ldb_dn_alloc_casefold: char *(void *, struct ldb_dn *)
 ldb_dn_alloc_linearized: char *(void *, struct ldb_dn *)
 ldb_dn_canonical_ex_string: char *(void *, struct ldb_dn *)
 ldb_dn_canonical_string: char *(void *, struct ldb_dn *)
-ldb_dn_check_local: _Bool (struct ldb_module *, struct ldb_dn *)
-ldb_dn_check_special: _Bool (struct ldb_dn *, const char *)
+ldb_dn_check_local: bool (struct ldb_module *, struct ldb_dn *)
+ldb_dn_check_special: bool (struct ldb_dn *, const char *)
 ldb_dn_compare: int (struct ldb_dn *, struct ldb_dn *)
 ldb_dn_compare_base: int (struct ldb_dn *, struct ldb_dn *)
 ldb_dn_copy: struct ldb_dn *(void *, struct ldb_dn *)
@@ -61,22 +61,22 @@ ldb_dn_get_linearized: const char *(struct ldb_dn *)
 ldb_dn_get_parent: struct ldb_dn *(void *, struct ldb_dn *)
 ldb_dn_get_rdn_name: const char *(struct ldb_dn *)
 ldb_dn_get_rdn_val: const struct ldb_val *(struct ldb_dn *)
-ldb_dn_has_extended: _Bool (struct ldb_dn *)
-ldb_dn_is_null: _Bool (struct ldb_dn *)
-ldb_dn_is_special: _Bool (struct ldb_dn *)
-ldb_dn_is_valid: _Bool (struct ldb_dn *)
+ldb_dn_has_extended: bool (struct ldb_dn *)
+ldb_dn_is_null: bool (struct ldb_dn *)
+ldb_dn_is_special: bool (struct ldb_dn *)
+ldb_dn_is_valid: bool (struct ldb_dn *)
 ldb_dn_map_local: struct ldb_dn *(struct ldb_module *, void *, struct ldb_dn *)
 ldb_dn_map_rebase_remote: struct ldb_dn *(struct ldb_module *, void *, struct ldb_dn *)
 ldb_dn_map_remote: struct ldb_dn *(struct ldb_module *, void *, struct ldb_dn *)
 ldb_dn_new: struct ldb_dn *(void *, struct ldb_context *, const char *)
 ldb_dn_new_fmt: struct ldb_dn *(void *, struct ldb_context *, const char *, ...)
-ldb_dn_remove_base_components: _Bool (struct ldb_dn *, unsigned int)
-ldb_dn_remove_child_components: _Bool (struct ldb_dn *, unsigned int)
+ldb_dn_remove_base_components: bool (struct ldb_dn *, unsigned int)
+ldb_dn_remove_child_components: bool (struct ldb_dn *, unsigned int)
 ldb_dn_remove_extended_components: void (struct ldb_dn *)
 ldb_dn_set_component: int (struct ldb_dn *, int, const char *, const struct ldb_val)
 ldb_dn_set_extended_component: int (struct ldb_dn *, const char *, const struct ldb_val *)
 ldb_dn_update_components: int (struct ldb_dn *, const struct ldb_dn *)
-ldb_dn_validate: _Bool (struct ldb_dn *)
+ldb_dn_validate: bool (struct ldb_dn *)
 ldb_dsdb_cache_module_ops: name = 0xXXXX "dsdb_cache", init_context = 0xXXXX <dsdb_cache_init>, search = 0, add = 0, modify = 0, del = 0, rename = 0, request = 0, extended = 0, start_transaction = 0, prepare_commit = 0, end_transaction = 0, del_transaction = 0, sequence_number = 0, private_data = 0xXXXX
 ldb_dump_results: void (struct ldb_context *, struct ldb_result *, FILE *)
 ldb_entryuuid_module_ops: name = 0xXXXX "entryuuid", init_context = 0xXXXX <entryuuid_init>, search = 0, add = 0, modify = 0, del = 0, rename = 0, request = 0, extended = 0xXXXX <entryuuid_extended>, start_transaction = 0, prepare_commit = 0, end_transaction = 0, del_transaction = 0, sequence_number = 0, private_data = 0xXXXX
@@ -200,10 +200,10 @@ ldb_register_module: int (const struct ldb_module_ops *)
 ldb_register_samba_handlers: int (struct ldb_context *)
 ldb_rename: int (struct ldb_context *, struct ldb_dn *, struct ldb_dn *)
 ldb_repl_meta_data_module_ops: name = 0xXXXX "repl_meta_data", init_context = 0xXXXX <replmd_init>, search = 0, add = 0xXXXX <replmd_add>, modify = 0xXXXX <replmd_modify>, del = 0xXXXX <replmd_delete>, rename = 0xXXXX <replmd_rename>, request = 0, extended = 0xXXXX <replmd_extended>, start_transaction = 0xXXXX <replmd_start_transaction>, prepare_commit = 0xXXXX <replmd_prepare_commit>, end_transaction = 0, del_transaction = 0xXXXX <replmd_del_transaction>, sequence_number = 0, private_data = 0xXXXX
-ldb_reply_add_control: int (struct ldb_reply *, const char *, _Bool, void *)
+ldb_reply_add_control: int (struct ldb_reply *, const char *, bool, void *)
 ldb_reply_get_control: struct ldb_control *(struct ldb_reply *, const char *)
 ldb_request: int (struct ldb_context *, struct ldb_request *)
-ldb_request_add_control: int (struct ldb_request *, const char *, _Bool, void *)
+ldb_request_add_control: int (struct ldb_request *, const char *, bool, void *)
 ldb_request_done: int (struct ldb_request *, int)
 ldb_request_get_control: struct ldb_control *(struct ldb_request *, const char *)
 ldb_request_get_status: int (struct ldb_request *)
@@ -231,7 +231,7 @@ ldb_search_default_callback: int (struct ldb_request *, struct ldb_reply *)
 ldb_sequence_number: int (struct ldb_context *, enum ldb_sequence_type, uint64_t *)
 ldb_server_sort_module_ops: name = 0xXXXX "server_sort", init_context = 0xXXXX <server_sort_init>, search = 0xXXXX <server_sort_search>, add = 0, modify = 0, del = 0, rename = 0, request = 0, extended = 0, start_transaction = 0, prepare_commit = 0, end_transaction = 0, del_transaction = 0, sequence_number = 0, private_data = 0xXXXX
 ldb_set_create_perms: void (struct ldb_context *, unsigned int)
-ldb_set_debug: int (struct ldb_context *, void (*)(void *, enum ldb_debug_level, const char *, struct __va_list_tag *), void *)
+ldb_set_debug: int (struct ldb_context *, void (*)(void *, enum ldb_debug_level, const char *, struct va_list *), void *)
 ldb_set_debug_stderr: int (struct ldb_context *)
 ldb_set_default_dns: void (struct ldb_context *)
 ldb_set_errstring: void (struct ldb_context *, const char *)