commit 9768ca48f57aaf035f508a473421d210b5145e99
author Greg Hartman <ghartman@google.com> Thu Jun 22 20:49:52 2017 -0700
committer Greg Hartman <ghartman@google.com> Fri Jun 23 15:44:15 2017 -0700
tree c2ba282fc91c65b4abbf688efbd6f09f467601da
parent 7b5a7c1b3bb341c2ce7fa7d6386d4204680a92e4

Merge openssh 7.5p1

BUG: 35443510
Change-Id: I2558fb80234e145c13ccb7a51859f2a5fd2e0324

xmalloc.h

diff --git a/xmalloc.h b/xmalloc.h
index 2bec77b..e499289 100644
--- a/xmalloc.h
+++ b/xmalloc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: xmalloc.h,v 1.15 2015/04/24 01:36:01 deraadt Exp $ */
+/* $OpenBSD: xmalloc.h,v 1.16 2016/02/15 09:47:49 dtucker Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -16,6 +16,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
+void	 ssh_malloc_init(void);
 void	*xmalloc(size_t);
 void	*xcalloc(size_t, size_t);
 void	*xreallocarray(void *, size_t, size_t);