Skip to content

Commit

Permalink
Merge branch 'linux_socket' of https://github.com/danlapid/cppcoro in…
Browse files Browse the repository at this point in the history
…to linux_socket
  • Loading branch information
danlapid committed Feb 10, 2024
2 parents 52d5ebf + b6b042b commit b7bb419
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 16 deletions.
8 changes: 4 additions & 4 deletions lib/io_service.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
# ifndef NOMINMAX
# define NOMINMAX
# endif
# include <WinSock2.h>
# include <WS2tcpip.h>
# include <MSWSock.h>
# include <Windows.h>
# include <winsock2.h>
# include <ws2tcpip.h>
# include <mswsock.h>
# include <windows.h>
#elif CPPCORO_OS_LINUX
typedef long long int LONGLONG;
typedef int DWORD;
Expand Down
8 changes: 4 additions & 4 deletions lib/socket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
#include "socket_helpers.hpp"

#if CPPCORO_OS_WINNT
# include <WinSock2.h>
# include <WS2tcpip.h>
# include <MSWSock.h>
# include <Windows.h>
# include <winsock2.h>
# include <ws2tcpip.h>
# include <mswsock.h>
# include <windows.h>
# include <memory>
# include <cstring>
#elif CPPCORO_OS_LINUX
Expand Down
8 changes: 4 additions & 4 deletions lib/socket_recv_from_operation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
# include "socket_helpers.hpp"

#if CPPCORO_OS_WINNT
# include <WinSock2.h>
# include <WS2tcpip.h>
# include <MSWSock.h>
# include <Windows.h>
# include <winsock2.h>
# include <ws2tcpip.h>
# include <mswsock.h>
# include <windows.h>

bool cppcoro::net::socket_recv_from_operation_impl::try_start(
cppcoro::detail::win32_overlapped_operation_base& operation) noexcept
Expand Down
9 changes: 5 additions & 4 deletions lib/socket_send_to_operation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@

#include "socket_helpers.hpp"

#include <winsock2.h>
#include <ws2tcpip.h>
#include <mswsock.h>
#include <windows.h>
#if CPPCORO_OS_WINNT
# include <winsock2.h>
# include <ws2tcpip.h>
# include <mswsock.h>
# include <windows.h>

bool cppcoro::net::socket_send_to_operation_impl::try_start(
cppcoro::detail::win32_overlapped_operation_base& operation) noexcept
Expand Down

0 comments on commit b7bb419

Please sign in to comment.