Use #ifdef _WIN32 rather than WIN32

[libs/core.git] / source / io / poll.h

diff --git a/source/io/poll.h b/source/io/poll.h
index f59b499ddbc3bad3702c42a56507c32969ddac84..952ea896068aff1c0da8bbcf2d14841a5364d3b2 100644 (file)
--- a/source/io/poll.h
+++ b/source/io/poll.h
@@ -9,7 +9,7 @@
 namespace Msp {
 namespace IO {
 
-class Base;
+class EventObject;
 
 enum PollEvent
 {
@@ -17,7 +17,8 @@ enum PollEvent
        P_INPUT = 1,
        P_PRIO = 2,
        P_OUTPUT = 4,
-       P_ERROR = 8
+       P_ERROR = 8,
+       P_HANGUP = 16
 };
 
 inline PollEvent operator|(PollEvent e, PollEvent f)
@@ -35,15 +36,15 @@ class Poller
 public:
        struct Slot
        {
-               Base *object;
+               EventObject *object;
                PollEvent events;
 
-               Slot(Base *o, PollEvent e): object(o), events(e) { }
+               Slot(EventObject *o, PollEvent e): object(o), events(e) { }
        };
 
        typedef std::list<Slot> SlotList;
 private:
-       typedef std::map<Base *, PollEvent> EventMap;
+       typedef std::map<EventObject *, PollEvent> EventMap;
 
        struct Private;
 
@@ -54,19 +55,21 @@ private:
 
 public:
        Poller();
+       ~Poller();
 
-       void set_object(Base &, PollEvent);
+       void set_object(EventObject &, PollEvent);
        int poll();
        int poll(const Time::TimeDelta &);
 private:
        void rebuild_array();
        int do_poll(int);
+       void platform_poll(int);
 public:
        const SlotList &get_result() const { return poll_result; }
 };
 
-PollEvent poll(Base &, PollEvent);
-PollEvent poll(Base &, PollEvent, const Time::TimeDelta &);
+PollEvent poll(EventObject &, PollEvent);
+PollEvent poll(EventObject &, PollEvent, const Time::TimeDelta &);
 
 } // namespace IO
 } // namespace Msp