summaryrefslogtreecommitdiff
path: root/controller
diff options
context:
space:
mode:
authorGrant Limberg <grant.limberg@zerotier.com>2019-03-04 16:27:52 -0800
committerGrant Limberg <grant.limberg@zerotier.com>2019-03-04 16:31:36 -0800
commit801401a6e7022fa44c129f6626d944722d1ec6be (patch)
tree3771b94d80abd1307b965e537d7cfa0f80841ef9 /controller
parentde1fc43cc58ce6a02c6eeef7791328c44189aa7c (diff)
parent270debb3fc39c3f1f6a3f6fbc2c5fb6183182c8f (diff)
downloadinfinitytier-801401a6e7022fa44c129f6626d944722d1ec6be.tar.gz
infinitytier-801401a6e7022fa44c129f6626d944722d1ec6be.zip
Merge branch 'dev' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into dev
Diffstat (limited to 'controller')
-rw-r--r--controller/PostgreSQL.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/controller/PostgreSQL.cpp b/controller/PostgreSQL.cpp
index 9eb64800..29d61a39 100644
--- a/controller/PostgreSQL.cpp
+++ b/controller/PostgreSQL.cpp
@@ -33,6 +33,7 @@
#include <libpq-fe.h>
#include <sstream>
#include <amqp.h>
+#include <amqp_tcp_socket.h>
using json = nlohmann::json;
namespace {