diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-04-17 17:31:17 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-04-17 17:31:17 +0000 |
| commit | 629c471c144e19cf113977ccdadf0b750c7ff739 (patch) | |
| tree | 55c666876b9d1637333c34a12737b751f376740f /ace/Dev_Poll_Reactor.cpp | |
| parent | 8bb125a332a6b0bbcbd341d46113792e70fa60bf (diff) | |
| download | ATCD-629c471c144e19cf113977ccdadf0b750c7ff739.tar.gz | |
ChangeLogTag:Wed Apr 17 10:29:14 2002 Ossama Othman <ossama@uci.edu>
Diffstat (limited to 'ace/Dev_Poll_Reactor.cpp')
| -rw-r--r-- | ace/Dev_Poll_Reactor.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/ace/Dev_Poll_Reactor.cpp b/ace/Dev_Poll_Reactor.cpp index b3ecbc7e6e9..c6002288a58 100644 --- a/ace/Dev_Poll_Reactor.cpp +++ b/ace/Dev_Poll_Reactor.cpp @@ -8,7 +8,7 @@ ACE_RCSID (ace, #if defined (ACE_HAS_EVENT_POLL) || defined (ACE_HAS_DEV_POLL) -#if defined (ACE_HAS_EVENT_POLL) && defined (linux) +# if defined (ACE_HAS_EVENT_POLL) && defined (linux) // #undef POLLIN // #undef POLLPRI @@ -17,21 +17,22 @@ ACE_RCSID (ace, // #undef POLLHUP // #undef POLLNVAL -# include <asm/page.h> +# include <asm/page.h> //# include <asm/poll.h> // @@ UGLY HACK ... REMOVE ME // <asm/poll.h> and <sys/poll.h> conflict. -#define POLLREMOVE 0x1000 -# include <linux/eventpoll.h> +# define POLLREMOVE 0x1000 +# include <linux/eventpoll.h> static const char ACE_POLL_DEVICE[] = "/dev/epoll"; -#elif defined (ACE_HAS_DEV_POLL) +# elif defined (ACE_HAS_DEV_POLL) -# if defined (sun) -# include <sys/devpoll.h> -# elif defined (linux) -# include <linux/devpoll.h> +# if defined (sun) +# include <sys/devpoll.h> +# elif defined (linux) +# include <linux/devpoll.h> +# endif /* sun */ static const char ACE_POLL_DEVICE[] = "/dev/poll"; |