Include missed bits from previous sync.

xmalloc.c

@@ -27,7 +27,7 @@
 #include "log.h"
 
 #if defined(__OpenBSD__)
-+char *malloc_options = "S";
+char *malloc_options = "S";
 #endif /* __OpenBSD__ */
 
 void *

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);