Skip to content

Commit

Permalink
update MacOSX.diff to fixes chenshuo#136
Browse files Browse the repository at this point in the history
  • Loading branch information
harrywong committed Apr 26, 2015
1 parent f987d36 commit 6361fec
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions MacOSX.diff
Original file line number Diff line number Diff line change
Expand Up @@ -310,17 +310,17 @@ index f5e6624..62fbd6f 100644
if (revents_ & (POLLIN | POLLPRI | POLLRDHUP))
{
if (readCallback_) readCallback_(receiveTime);
@@ -125,8 +128,10 @@ string Channel::reventsToString() const
@@ -135,8 +138,10 @@ string Channel::eventsToString(int fd, int ev)
oss << "OUT ";
if (revents_ & POLLHUP)
if (ev & POLLHUP)
oss << "HUP ";
+#ifdef POLLRDHUP
if (revents_ & POLLRDHUP)
if (ev & POLLRDHUP)
oss << "RDHUP ";
+#endif
if (revents_ & POLLERR)
if (ev & POLLERR)
oss << "ERR ";
if (revents_ & POLLNVAL)
if (ev & POLLNVAL)
diff --git a/muduo/net/Endian.h b/muduo/net/Endian.h
index b277503..851e449 100644
--- a/muduo/net/Endian.h
Expand Down Expand Up @@ -471,7 +471,7 @@ diff --git a/muduo/net/EventLoop.h b/muduo/net/EventLoop.h
index 5741961..b03dd67 100644
--- a/muduo/net/EventLoop.h
+++ b/muduo/net/EventLoop.h
@@ -146,7 +146,7 @@ class EventLoop : boost::noncopyable
@@ -156,7 +156,7 @@ class EventLoop : boost::noncopyable
Timestamp pollReturnTime_;
boost::scoped_ptr<Poller> poller_;
boost::scoped_ptr<TimerQueue> timerQueue_;
Expand Down

0 comments on commit 6361fec

Please sign in to comment.