Include missed bits from previous sync.

This commit is contained in:
Darren Tucker 2019-06-08 00:47:07 +10:00
parent 25e3bccbaa
commit 130ef0695e
2 changed files with 2 additions and 3 deletions

View File

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

View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -16,7 +16,6 @@
* called by a name other than "ssh" or "Secure Shell". * called by a name other than "ssh" or "Secure Shell".
*/ */
void ssh_malloc_init(void);
void *xmalloc(size_t); void *xmalloc(size_t);
void *xcalloc(size_t, size_t); void *xcalloc(size_t, size_t);
void *xreallocarray(void *, size_t, size_t); void *xreallocarray(void *, size_t, size_t);