[openssh-commits] [openssh] 01/01: Include missed bits from previous sync.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 130ef0695e1731392ca33831939fe89e8b70cc17
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Sat Jun 8 00:47:07 2019 +1000

    Include missed bits from previous sync.
---
 xmalloc.c | 2 +-
 xmalloc.h | 3 +--
 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 at 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);

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.