event/Loop: reorder includes
This just happened to break the Windows build because of the `GetObject` macro in `windows.h`, so I added a kludge to PollResultGeneric.hxx.
This commit is contained in:
parent
75802ebcc6
commit
22bea5c97e
|
@ -20,15 +20,14 @@
|
|||
#ifndef MPD_EVENT_LOOP_HXX
|
||||
#define MPD_EVENT_LOOP_HXX
|
||||
|
||||
#include "thread/Id.hxx"
|
||||
#include "util/Compiler.h"
|
||||
|
||||
#include "PollGroup.hxx"
|
||||
#include "thread/Mutex.hxx"
|
||||
#include "WakeFD.hxx"
|
||||
#include "SocketMonitor.hxx"
|
||||
#include "IdleMonitor.hxx"
|
||||
#include "DeferEvent.hxx"
|
||||
#include "thread/Id.hxx"
|
||||
#include "thread/Mutex.hxx"
|
||||
#include "util/Compiler.h"
|
||||
|
||||
#include <boost/intrusive/set.hpp>
|
||||
#include <boost/intrusive/list.hpp>
|
||||
|
|
|
@ -23,6 +23,14 @@
|
|||
#include <cstddef>
|
||||
#include <vector>
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <windows.h>
|
||||
/* damn you, windows.h! */
|
||||
#ifdef GetObject
|
||||
#undef GetObject
|
||||
#endif
|
||||
#endif
|
||||
|
||||
class PollResultGeneric
|
||||
{
|
||||
struct Item
|
||||
|
|
Loading…
Reference in New Issue