Merge remote-tracking branch 'refs/remotes/origin/master' into enet_wip_nothing_to_see_here

2017-01-27 16:26:02 +01:00
parent f59b59da27 90237186b5
commit 0075c22e0c
2 changed files with 3 additions and 1 deletions
--- a/src/Nazara/Network/Posix/SocketImpl.cpp
+++ b/src/Nazara/Network/Posix/SocketImpl.cpp
@@ -5,6 +5,7 @@
 #include <Nazara/Network/Posix/SocketImpl.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/Log.hpp>
+#include <Nazara/Core/MemoryManager.hpp>
 #include <Nazara/Network/Posix/IpAddressImpl.hpp>
 #include <netinet/tcp.h>
 #include <sys/ioctl.h>
--- a/src/Nazara/Network/Posix/SocketImpl.hpp
+++ b/src/Nazara/Network/Posix/SocketImpl.hpp
@@ -10,6 +10,7 @@
 #include <Nazara/Network/SocketHandle.hpp>
 #include <Nazara/Network/Enums.hpp>
 #include <Nazara/Network/IpAddress.hpp>
+#include <Nazara/Network/NetBuffer.hpp>

 #define NAZARA_NETWORK_POLL_SUPPORT 1

@@ -88,4 +89,4 @@ namespace Nz
 	};
 }

-#endif // NAZARA_SOCKETIMPL_HPP
+#endif // NAZARA_SOCKETIMPL_HPP