void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-07 21:13:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix include for system lz4.

Browse source
This commit is contained in:
Adam Ierymenko 2016-06-08 12:50:56 -07:00
parent 4da9d4e53a
commit 6c6b18d003
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
make-linux.mk
View file

@ -41,6 +41,7 @@ ifeq ($(wildcard /usr/include/lz4.h),)
OBJS+=ext/lz4/lz4.o OBJS+=ext/lz4/lz4.o
else else
LDLIBS+=-llz4 LDLIBS+=-llz4
DEFS+=-DZT_USE_SYSTEM_LZ4
endif endif
ifeq ($(wildcard /usr/include/http_parser.h),) ifeq ($(wildcard /usr/include/http_parser.h),)
OBJS+=ext/http-parser/http_parser.o OBJS+=ext/http-parser/http_parser.o

4
node/Packet.hpp
View file

@ -34,7 +34,11 @@
#include "Utils.hpp" #include "Utils.hpp"
#include "Buffer.hpp" #include "Buffer.hpp"
#ifdef ZT_USE_SYSTEM_LZ4
#include <lz4.h>
#else
#include "../ext/lz4/lz4.h" #include "../ext/lz4/lz4.h"
#endif
/** /**
* Protocol version -- incremented only for major changes * Protocol version -- incremented only for major changes