Build with libabyss

daemon/main.cpp

@@ -1,9 +1,10 @@
 #include <config.hpp>  // for ensure_config
-#include <util/fs.hpp>
-#include <getopt.h>
 #include <libgen.h>
 #include <llarp.h>
+#include <util/fs.hpp>
 #include <util/logger.hpp>
+
+#include <getopt.h>
 #include <signal.h>
 
 #include <string>

libabyss/include/abyss/client.hpp

@@ -2,7 +2,7 @@
 #define __ABYSS_CLIENT_HPP__
 
 #include <abyss/json.hpp>
-#include <ev.h>
+#include <ev/ev.h>
 #include <util/string_view.hpp>
 
 #include <deque>

libabyss/include/abyss/server.hpp

@@ -2,8 +2,8 @@
 #define __ABYSS_SERVER_HPP__
 
 #include <abyss/json.hpp>
-#include <ev.h>
-#include <logic.hpp>
+#include <ev/ev.h>
+#include <util/logic.hpp>
 #include <util/string_view.hpp>
 #include <util/time.hpp>
 

libabyss/main.cpp

@@ -1,5 +1,5 @@
 #include <libabyss.hpp>
-#include <net.hpp>
+#include <net/net.hpp>
 
 #ifndef _WIN32
 #include <sys/signal.h>

llarp/ev/ev_epoll.hpp

@@ -25,7 +25,7 @@
 
 namespace llarp
 {
-  int
+  inline int
   tcp_conn::read(byte_t* buf, size_t sz)
   {
     if(_shouldClose)
@@ -47,14 +47,14 @@ namespace llarp
     return 0;
   }
 
-  void
+  inline void
   tcp_conn::flush_write()
   {
     connected();
     ev_io::flush_write();
   }
 
-  ssize_t
+  inline ssize_t
   tcp_conn::do_write(void* buf, size_t sz)
   {
     if(_shouldClose)
@@ -65,7 +65,7 @@ namespace llarp
     return ::send(fd, buf, sz, MSG_NOSIGNAL);  // ignore sigpipe
   }
 
-  void
+  inline void
   tcp_conn::connect()
   {
     socklen_t slen = sizeof(sockaddr_in);
@@ -94,7 +94,7 @@ namespace llarp
     }
   }
 
-  int
+  inline int
   tcp_serv::read(byte_t*, size_t)
   {
     int new_fd = ::accept(fd, nullptr, nullptr);

test/test_libabyss.cpp

@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include <libabyss.hpp>
-#include <ev.h>
-#include <net.hpp>
+#include <ev/ev.h>
+#include <net/net.hpp>
 #include <util/threading.hpp>
 
 struct AbyssTestBase : public ::testing::Test