summaryrefslogtreecommitdiff
path: root/src/or/directory.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-01-04 22:47:42 +0000
committerNick Mathewson <nickm@torproject.org>2009-01-04 22:47:42 +0000
commit743c6c827778533fcbd7b3075311dc5c547b9846 (patch)
tree3547d116e7842696c9cb3aa19d09225e1b38ca6b /src/or/directory.c
parent26482e855b376b0f8ec795dc8c293b74bc66fefd (diff)
downloadtor-743c6c827778533fcbd7b3075311dc5c547b9846.tar.gz
tor-743c6c827778533fcbd7b3075311dc5c547b9846.zip
OpenBSD malloc.h believes that you should be able to detect headers with autoconf, or build without warnings, but not both. So never include malloc.h on OpenBSD. Backport candidate.
svn:r17891
Diffstat (limited to 'src/or/directory.c')
-rw-r--r--src/or/directory.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/directory.c b/src/or/directory.c
index 34dcdd603b..d628035bb0 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -5,8 +5,10 @@
#include "or.h"
#if defined(EXPORTMALLINFO) && defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
+#ifndef OPENBSD
#include <malloc.h>
#endif
+#endif
/**
* \file directory.c