From 6c6b18d003c865619582b254be1ea7f6e11ef58c Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Wed, 8 Jun 2016 12:50:56 -0700 Subject: Fix include for system lz4. --- make-linux.mk | 1 + node/Packet.hpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/make-linux.mk b/make-linux.mk index 8355909f..bd81f4df 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -41,6 +41,7 @@ ifeq ($(wildcard /usr/include/lz4.h),) OBJS+=ext/lz4/lz4.o else LDLIBS+=-llz4 + DEFS+=-DZT_USE_SYSTEM_LZ4 endif ifeq ($(wildcard /usr/include/http_parser.h),) OBJS+=ext/http-parser/http_parser.o diff --git a/node/Packet.hpp b/node/Packet.hpp index f3f197e7..79fff344 100644 --- a/node/Packet.hpp +++ b/node/Packet.hpp @@ -34,7 +34,11 @@ #include "Utils.hpp" #include "Buffer.hpp" +#ifdef ZT_USE_SYSTEM_LZ4 +#include +#else #include "../ext/lz4/lz4.h" +#endif /** * Protocol version -- incremented only for major changes -- cgit v1.2.3