From eda5e1902f494573a8c2c3da6172c26892e5fef4 Mon Sep 17 00:00:00 2001
From: Jonas Wielicki <j.wielicki@sotecware.net>
Date: Wed, 31 Jul 2013 14:25:23 +0200
Subject: [PATCH] Make the API more accessible by publishing constants

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

diff --git a/src/usocket.c b/src/usocket.c
index 096ecd0..13bc165 100644
--- a/src/usocket.c
+++ b/src/usocket.c
@@ -17,9 +17,6 @@
 #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;
@@ -38,9 +35,6 @@ int socket_waitfd(p_socket ps, int sw, p_timeout tm) {
 }
 #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;
diff --git a/src/usocket.h b/src/usocket.h
index 45f2f99..ca67c95 100644
--- a/src/usocket.h
+++ b/src/usocket.h
@@ -56,4 +56,20 @@ typedef struct sockaddr_storage t_sockaddr_storage;
 
 #define SOCKET_INVALID (-1)
 
+#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
+
+
 #endif /* USOCKET_H */
diff --git a/src/wsocket.c b/src/wsocket.c
index b4a4384..284c5fe 100644
--- a/src/wsocket.c
+++ b/src/wsocket.c
@@ -39,10 +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;
diff --git a/src/wsocket.h b/src/wsocket.h
index 3986640..55ab0a9 100644
--- a/src/wsocket.h
+++ b/src/wsocket.h
@@ -30,4 +30,9 @@ typedef t_socket *p_socket;
 #define AI_NUMERICSERV (0)
 #endif
 
+#define WAITFD_R        1
+#define WAITFD_W        2
+#define WAITFD_E        4
+#define WAITFD_C        (WAITFD_E|WAITFD_W)
+
 #endif /* WSOCKET_H */