Include missed bits from previous sync.

diff --git a/xmalloc.c b/xmalloc.c
index be26510cfb01dac238695e6268f436514de14c42..dc22757b01dabd2f2e6cbf5c329b7a0d9b7d1b25 100644 (file)
--- 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 cf38ddfa48c5c4bff6b031ca800b6a2b6f745d6d..1d5f62df77a37898b06a20919b7235587e9d1b80 100644 (file)
--- 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);