summaryrefslogtreecommitdiffstats
path: root/xmalloc.h
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2019-06-07 16:47:07 +0200
committerDarren Tucker <dtucker@dtucker.net>2019-06-07 16:47:07 +0200
commit130ef0695e1731392ca33831939fe89e8b70cc17 (patch)
tree7258880f044236f88cf9d896c66adcf0ccc66cd7 /xmalloc.h
parentupstream: Check for user@host when parsing sftp target. This (diff)
downloadopenssh-130ef0695e1731392ca33831939fe89e8b70cc17.tar.xz
openssh-130ef0695e1731392ca33831939fe89e8b70cc17.zip
Include missed bits from previous sync.
Diffstat (limited to 'xmalloc.h')
-rw-r--r--xmalloc.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/xmalloc.h b/xmalloc.h
index cf38ddfa4..1d5f62df7 100644
--- a/xmalloc.h
+++ b/xmalloc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: xmalloc.h,v 1.17 2017/05/31 09:15:42 deraadt Exp $ */
+/* $OpenBSD: xmalloc.h,v 1.18 2019/06/06 05:13:13 otto Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -16,7 +16,6 @@
* 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);