From 8d8f1862035928337870d1ee9fbe0e23b1032e17 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Fri, 17 Jul 2015 17:36:33 +0000
Subject: merge conflicts

---
 usr.sbin/nsd/util.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'usr.sbin/nsd/util.h')

diff --git a/usr.sbin/nsd/util.h b/usr.sbin/nsd/util.h
index e8100bd724b..51741cef58e 100644
--- a/usr.sbin/nsd/util.h
+++ b/usr.sbin/nsd/util.h
@@ -135,7 +135,9 @@ lookup_table_type *lookup_by_id(lookup_table_type table[], int id);
  * return NULL.
  */
 void *xalloc(size_t size);
+void *xmallocarray(size_t num, size_t size);
 void *xalloc_zero(size_t size);
+void *xalloc_array_zero(size_t num, size_t size);
 void *xrealloc(void *ptr, size_t size);
 
 /*
-- 
cgit v1.2.3-59-g8ed1b