include <alloca> only on windows, re-add template for JsonAdapter

5 years ago · a2db128c7f
parent 2ac00a885a
commit a2db128c7f
2 changed files with 5 additions and 1 deletions
--- a/server/logger.cc
+++ b/server/logger.cc
@ -10,7 +10,10 @@
 #include <thread>
 #include <sstream>
 #include <vector>
-#include <alloca>
+
+#ifdef _WIN32
+#  include <alloca>
+#endif

 #ifdef LOGGER_ENABLE_SYSLOG
 extern "C" {
--- a/server/pep-types.cc
+++ b/server/pep-types.cc
@ -1,6 +1,7 @@
 #include "pep-types.hh"
 #include "pep-utils.hh"
 #include "pep-utils-json.hh"
+#include "json-adapter.hh"

 #include <pEp/pEp_string.h>
 #include <iostream> // Just to print debug stuff to std::cerr