summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2019-06-08 00:47:07 +1000
committerDarren Tucker <dtucker@dtucker.net>2019-06-08 00:47:07 +1000
commit130ef0695e1731392ca33831939fe89e8b70cc17 (patch)
tree7258880f044236f88cf9d896c66adcf0ccc66cd7
parent25e3bccbaa63d27b9d5e09c123f1eb28594d2bd6 (diff)
downloadopenssh-git-130ef0695e1731392ca33831939fe89e8b70cc17.tar.gz
Include missed bits from previous sync.
-rw-r--r--xmalloc.c2
-rw-r--r--xmalloc.h3
2 files changed, 2 insertions, 3 deletions
diff --git a/xmalloc.c b/xmalloc.c
index be26510c..dc22757b 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -27,7 +27,7 @@
#include "log.h"
#if defined(__OpenBSD__)
-+char *malloc_options = "S";
+char *malloc_options = "S";
#endif /* __OpenBSD__ */
void *
diff --git a/xmalloc.h b/xmalloc.h
index cf38ddfa..1d5f62df 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);