nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
svn:r17891
This commit is contained in:
Nick Mathewson 2009-01-04 22:47:42 +00:00
parent 26482e855b
commit 743c6c8277
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/util.c
View File

@ -72,8 +72,13 @@
#include <malloc/malloc.h> #include <malloc/malloc.h>
#endif #endif
#ifdef HAVE_MALLOC_H #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> #include <malloc.h>
#endif #endif
#endif
#ifdef HAVE_MALLOC_NP_H #ifdef HAVE_MALLOC_NP_H
#include <malloc_np.h> #include <malloc_np.h>
#endif #endif

2
src/or/directory.c
View File

@ -5,8 +5,10 @@
#include "or.h" #include "or.h"
#if defined(EXPORTMALLINFO) && defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO) #if defined(EXPORTMALLINFO) && defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
#ifndef OPENBSD
#include <malloc.h> #include <malloc.h>
#endif #endif
#endif
/** /**
* \file directory.c * \file directory.c