Merge branch 'v0.20.x'

This commit is contained in:
Max Kellermann 2018-02-24 23:18:25 +01:00
commit 1fb358249b

View File

@ -40,6 +40,9 @@ public:
~ScopeNetInit() noexcept { ~ScopeNetInit() noexcept {
WSACleanup(); WSACleanup();
} }
#else
public:
ScopeNetInit() {}
#endif #endif
}; };