oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

evnet/SocketMonitor: move WIN32/ERROR comment to PollGroupWinSelect.hxx

Browse Source
This commit is contained in:
Max Kellermann 2017-11-10 19:57:54 +01:00
parent 2670e13cbd
commit 3c41e9f022
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/event/MultiSocketMonitor.hxx
View File

@ -31,14 +31,6 @@
#include <assert.h> #include <assert.h>
#ifdef WIN32
/* ERROR is a WIN32 macro that poisons our namespace; this is a kludge
to allow us to use it anyway */
#ifdef ERROR
#undef ERROR
#endif
#endif
#ifndef WIN32 #ifndef WIN32
struct pollfd; struct pollfd;
#endif #endif

2
src/event/PollGroupWinSelect.hxx
View File

@ -32,6 +32,8 @@
#include <windows.h> #include <windows.h>
#include <winsock2.h> #include <winsock2.h>
/* ERROR is a WIN32 macro that poisons our namespace; this is a kludge
to allow us to use it anyway */
#ifdef ERROR #ifdef ERROR
#undef ERROR #undef ERROR
#endif #endif

8
src/event/SocketMonitor.hxx
View File

@ -29,14 +29,6 @@
#include <assert.h> #include <assert.h>
#include <stddef.h> #include <stddef.h>
#ifdef WIN32
/* ERROR is a WIN32 macro that poisons our namespace; this is a kludge
to allow us to use it anyway */
#ifdef ERROR
#undef ERROR
#endif
#endif
class EventLoop; class EventLoop;
/** /**