generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2026-01-11 00:24:15 +01:00
Code Issues Projects Releases Wiki Activity

Guard NOMINMAX ifdef (#3906)

Browse Source
This commit is contained in:
R. Savchenko
2023-01-24 07:42:43 +01:00
committed by GitHub
parent b941a20b8c
commit 079b50e0c1
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Foundation/include/Poco/UnWindows.h
View File

@@ -26,15 +26,17 @@
#endif
// disable min/max macros
#define NOMINMAX
#if !defined(NOMINMAX)
#define NOMINMAX
#endif
#if !defined(POCO_NO_WINDOWS_H)
#include <windows.h>
#ifdef __MINGW32__
#include <winsock2.h>
#include <iphlpapi.h>
#include <ws2tcpip.h>
#endif // __MINGW32__
#include <windows.h>
#ifdef __MINGW32__
#include <winsock2.h>
#include <iphlpapi.h>
#include <ws2tcpip.h>
#endif // __MINGW32__
#endif

1
Net/src/WebSocketImpl.cpp
View File

@@ -12,7 +12,6 @@
//
#define NOMINMAX
#include "Poco/Net/WebSocketImpl.h"
#include "Poco/Net/NetException.h"
#include "Poco/Net/WebSocket.h"