Merge pull request #1459

b00da61e Preliminary support for DragonFly BSD (Antonio Huete Jimenez)
This commit is contained in:
Riccardo Spagni 2016-12-15 14:36:35 +02:00
commit 29735c8f8f
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
8 changed files with 23 additions and 14 deletions

View file

@ -36,7 +36,8 @@
#include "gtest/gtest.h"
// OS X, FreeBSD, and OpenBSD don't need malloc.h
#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && \
!defined(__DragonFly__)
#include <malloc.h>
#endif