diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-05 10:31:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-05 10:31:00 -0400 |
| commit | 7f45ea5c41bd076accd3720c021e6d3b512fb2b2 (patch) | |
| tree | af409914df269d50de5bfb6d75b63e91d10f24e5 /src/common/util.c | |
| parent | b4bd4964eba5b0dae811a5c28c664b8f78a0672c (diff) | |
| parent | f35271bf3eceadd03bff26d34c1d020892d6c6f0 (diff) | |
| download | tor-7f45ea5c41bd076accd3720c021e6d3b512fb2b2.tar.gz tor-7f45ea5c41bd076accd3720c021e6d3b512fb2b2.zip | |
Merge remote-tracking branch 'public/bug3894'
Diffstat (limited to 'src/common/util.c')
| -rw-r--r-- | src/common/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/util.c b/src/common/util.c index 09cb2e966f..74f8bd84b6 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -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. */ |