Skip to content

Commit 7cdc15a

Browse files
fix: Improve compatiblity with socket (#1229)
2 parents 5b0b339 + ec9f59f commit 7cdc15a

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

include/dpp/export.h

+4-6
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,10 @@ extern bool DPP_EXPORT validate_configuration();
115115

116116
}
117117

118-
#ifndef _WIN32
119-
#define SOCKET int
120-
#else
121-
#ifndef NOMINMAX
122-
#define NOMINMAX
123-
#endif
118+
#ifdef _WIN32
119+
#ifndef NOMINMAX
120+
#define NOMINMAX
121+
#endif
124122

125123
#include <WinSock2.h>
126124
#endif

include/dpp/socket.h

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
#pragma once
22

3-
#ifndef _WIN32
4-
#ifndef SOCKET
5-
#define SOCKET int
6-
#endif
7-
#endif
8-
93
namespace dpp
104
{
115
/**
126
* @brief Represents a socket file descriptor.
137
* This is used to ensure parity between windows and unix-like systems.
148
*/
15-
typedef SOCKET socket;
9+
#ifndef _WIN32
10+
using socket = int;
11+
#else
12+
using socket = SOCKET;
13+
#endif
1614
} // namespace dpp
1715

1816
#ifndef SOCKET_ERROR

0 commit comments

Comments
 (0)