Merge remote-tracking branch 'public/bug3894'

This commit is contained in:
Nick Mathewson
2012-06-05 10:31:00 -04:00
5 changed files with 20 additions and 1 deletions
+1 -1
View File
@@ -80,7 +80,7 @@
#include <malloc/malloc.h>
#endif
#ifdef HAVE_MALLOC_H
#ifndef OPENBSD
#if !defined(OPENBSD) && !defined(__FreeBSD__)
/* OpenBSD has a malloc.h, but for our purposes, it only exists in order to
* scold us for being so stupid as to autodetect its presence. To be fair,
* they've done this since 1996, when autoconf was only 5 years old. */