OpenBSD malloc.h believes that you should be able to detect headers with autoconf...

svn:r17891

diff --git a/src/common/util.c b/src/common/util.c
index 7dc8bcfb9e6e079d3beeb987e4bee176d0a52752..c383417fde940898bcd4a4ed37c01797e0971297 100644 (file)
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -72,8 +72,13 @@
 #include <malloc/malloc.h>
 #endif
 #ifdef HAVE_MALLOC_H
+#ifndef OPENBSD
+/* 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. */
 #include <malloc.h>
 #endif
+#endif
 #ifdef HAVE_MALLOC_NP_H
 #include <malloc_np.h>
 #endif

diff --git a/src/or/directory.c b/src/or/directory.c
index 34dcdd603b90a64012602a6f31309a0434e8ab35..d628035bb0c073ef537b3af8a14879a30fca9891 100644 (file)
--- 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