diff options
author | sthen <sthen@openbsd.org> | 2015-07-17 17:36:33 +0000 |
---|---|---|
committer | sthen <sthen@openbsd.org> | 2015-07-17 17:36:33 +0000 |
commit | 8d8f1862035928337870d1ee9fbe0e23b1032e17 (patch) | |
tree | b4f8b3fcc405ab0beff4cd0894c773320a250456 /usr.sbin/nsd/util.h | |
parent | Convert ssl_parse_serverhello_use_srtp_ext to CBS. (diff) | |
download | wireguard-openbsd-8d8f1862035928337870d1ee9fbe0e23b1032e17.tar.xz wireguard-openbsd-8d8f1862035928337870d1ee9fbe0e23b1032e17.zip |
merge conflicts
Diffstat (limited to 'usr.sbin/nsd/util.h')
-rw-r--r-- | usr.sbin/nsd/util.h | 2 |
1 files changed, 2 insertions, 0 deletions
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); /* |