From beb82fb17307ea70c1d3e920012a920e4a14867b Mon Sep 17 00:00:00 2001
From: Bruno Silvestre <brunoos@inf.ufg.br>
Date: Thu, 12 Sep 2013 09:28:31 -0300
Subject: [PATCH] Move #define WAITFD_* to .h

---
 src/usocket.c | 10 ----------
 src/usocket.h | 11 +++++++++++
 src/wsocket.c |  5 -----
 src/wsocket.h |  5 +++++
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/usocket.c b/src/usocket.c
index 096ecd0..da09130 100644
--- a/src/usocket.c
+++ b/src/usocket.c
@@ -15,11 +15,6 @@
 * Wait for readable/writable/connected socket with timeout
 \*-------------------------------------------------------------------------*/
 #ifndef SOCKET_SELECT
-#include <sys/poll.h>
-
-#define WAITFD_R        POLLIN
-#define WAITFD_W        POLLOUT
-#define WAITFD_C        (POLLIN|POLLOUT)
 int socket_waitfd(p_socket ps, int sw, p_timeout tm) {
     int ret;
     struct pollfd pfd;
@@ -37,11 +32,6 @@ int socket_waitfd(p_socket ps, int sw, p_timeout tm) {
     return IO_DONE;
 }
 #else
-
-#define WAITFD_R        1
-#define WAITFD_W        2
-#define WAITFD_C        (WAITFD_R|WAITFD_W)
-
 int socket_waitfd(p_socket ps, int sw, p_timeout tm) {
     int ret;
     fd_set rfds, wfds, *rp, *wp;
diff --git a/src/usocket.h b/src/usocket.h
index 45f2f99..ecbcd8e 100644
--- a/src/usocket.h
+++ b/src/usocket.h
@@ -31,6 +31,17 @@
 #include <netinet/tcp.h>
 #include <net/if.h>
 
+#ifndef SOCKET_SELECT
+#include <sys/poll.h>
+#define WAITFD_R        POLLIN
+#define WAITFD_W        POLLOUT
+#define WAITFD_C        (POLLIN|POLLOUT)
+#else
+#define WAITFD_R        1
+#define WAITFD_W        2
+#define WAITFD_C        (WAITFD_R|WAITFD_W)
+#endif
+
 #ifndef SO_REUSEPORT
 #define SO_REUSEPORT SO_REUSEADDR
 #endif
diff --git a/src/wsocket.c b/src/wsocket.c
index b4a4384..8c7640e 100644
--- a/src/wsocket.c
+++ b/src/wsocket.c
@@ -39,11 +39,6 @@ int socket_close(void) {
 /*-------------------------------------------------------------------------*\
 * Wait for readable/writable/connected socket with timeout
 \*-------------------------------------------------------------------------*/
-#define WAITFD_R        1
-#define WAITFD_W        2
-#define WAITFD_E        4
-#define WAITFD_C        (WAITFD_E|WAITFD_W)
-
 int socket_waitfd(p_socket ps, int sw, p_timeout tm) {
     int ret;
     fd_set rfds, wfds, efds, *rp = NULL, *wp = NULL, *ep = NULL;
diff --git a/src/wsocket.h b/src/wsocket.h
index 3986640..c5a4b1c 100644
--- a/src/wsocket.h
+++ b/src/wsocket.h
@@ -16,6 +16,11 @@ typedef SOCKADDR_STORAGE t_sockaddr_storage;
 typedef SOCKET t_socket;
 typedef t_socket *p_socket;
 
+#define WAITFD_R        1
+#define WAITFD_W        2
+#define WAITFD_E        4
+#define WAITFD_C        (WAITFD_E|WAITFD_W)
+
 #ifndef IPV6_V6ONLY
 #define IPV6_V6ONLY 27
 #endif