summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-01-05 09:09:34 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-01-05 09:09:34 +0000
commitff3da05fd5b0c6a0b00bd6b99f7ec6bdadc34dda (patch)
tree06d901808a2a8ea7ad4c4260c839b5c3bd8206c1
parent9d9fc627603b495798d490f7c0fd03f6ebfce9e8 (diff)
downloadATCD-ff3da05fd5b0c6a0b00bd6b99f7ec6bdadc34dda.tar.gz
ChangeLogTag: Wed Jan 5 09:09:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ace/Dev_Poll_Reactor.cpp21
1 files changed, 9 insertions, 12 deletions
diff --git a/ace/Dev_Poll_Reactor.cpp b/ace/Dev_Poll_Reactor.cpp
index 11217b312ac..d8c397d0620 100644
--- a/ace/Dev_Poll_Reactor.cpp
+++ b/ace/Dev_Poll_Reactor.cpp
@@ -9,23 +9,20 @@ ACE_RCSID (ace,
#if defined (ACE_HAS_EVENT_POLL) || defined (ACE_HAS_DEV_POLL)
-# if defined (ACE_HAS_EVENT_POLL) && defined (linux)
-
-# include "ace/OS_NS_unistd.h"
-# include "ace/OS_NS_fcntl.h"
-
-# include /**/ <sys/epoll.h>
-
-# elif defined (ACE_HAS_DEV_POLL)
-
+# if defined (ACE_HAS_EVENT_POLL)
+# include "ace/OS_NS_unistd.h"
+# include "ace/OS_NS_fcntl.h"
+# endif
+
+# if defined (ACE_HAS_EVENT_POLL) && defined (linux)
+# include /**/ <sys/epoll.h>
+# elif defined (ACE_HAS_DEV_POLL)
# if defined (sun)
# include /**/ <sys/devpoll.h>
# elif defined (linux)
# include /**/ <linux/devpoll.h>
# endif /* sun */
-
-# endif /* ACE_HAS_DEV_POLL */
-
+# endif /* ACE_HAS_DEV_POLL */
#if !defined (__ACE_INLINE__)
# include "ace/Dev_Poll_Reactor.inl"