From da40fbd0549a99ef7e8fcebd26b55f46adbc2084 Mon Sep 17 00:00:00 2001
From: jani <jani>
Date: Mon, 17 Feb 2003 11:34:48 +0000
Subject: [PATCH] move FD_SET defines to sockets.h from arch.h .Last arg of
 select is not a const according to linux and openBSD manpages

---
 src/api/sockets.c          |  2 +-
 src/include/lwip/arch.h    | 18 ------------------
 src/include/lwip/sockets.h | 21 ++++++++++++++++++++-
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/api/sockets.c b/src/api/sockets.c
index 27a23af2..d8e8361f 100644
--- a/src/api/sockets.c
+++ b/src/api/sockets.c
@@ -646,7 +646,7 @@ lwip_selscan(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset)
 /*-----------------------------------------------------------------------------------*/
 int
 lwip_select(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset,
-               const struct timeval *timeout)
+               struct timeval *timeout)
 {
     int i;
     int nready;
diff --git a/src/include/lwip/arch.h b/src/include/lwip/arch.h
index d4f1bff7..aa58965a 100644
--- a/src/include/lwip/arch.h
+++ b/src/include/lwip/arch.h
@@ -54,24 +54,6 @@
 #define PACK_STRUCT_FIELD(x) x
 #endif /* PACK_STRUCT_FIELD */
 
-#ifndef FD_SET
-  #undef  FD_SETSIZE
-  #define FD_SETSIZE    16
-  #define FD_SET(n, p)  ((p)->fd_bits[(n)/8] |=  (1 << ((n) & 7)))
-  #define FD_CLR(n, p)  ((p)->fd_bits[(n)/8] &= ~(1 << ((n) & 7)))
-  #define FD_ISSET(n,p) ((p)->fd_bits[(n)/8] &   (1 << ((n) & 7)))
-  #define FD_ZERO(p)    memset((void*)(p),0,sizeof(*(p)))
-
-  typedef struct fd_set {
-          unsigned char fd_bits [(FD_SETSIZE+7)/8];
-        } fd_set;
-
-  struct timeval {
-	  long    tv_sec;         /* seconds */
-	  long    tv_usec;        /* and microseconds */
-  };
-
-#endif
 
 
 #ifdef LWIP_PROVIDE_ERRNO
diff --git a/src/include/lwip/sockets.h b/src/include/lwip/sockets.h
index f1b91305..adbefe81 100644
--- a/src/include/lwip/sockets.h
+++ b/src/include/lwip/sockets.h
@@ -164,6 +164,25 @@ struct linger {
 #define O_NONBLOCK    04000
 #endif
 
+#ifndef FD_SET
+  #undef  FD_SETSIZE
+  #define FD_SETSIZE    16
+  #define FD_SET(n, p)  ((p)->fd_bits[(n)/8] |=  (1 << ((n) & 7)))
+  #define FD_CLR(n, p)  ((p)->fd_bits[(n)/8] &= ~(1 << ((n) & 7)))
+  #define FD_ISSET(n,p) ((p)->fd_bits[(n)/8] &   (1 << ((n) & 7)))
+  #define FD_ZERO(p)    memset((void*)(p),0,sizeof(*(p)))
+
+  typedef struct fd_set {
+          unsigned char fd_bits [(FD_SETSIZE+7)/8];
+        } fd_set;
+
+  struct timeval {
+	  long    tv_sec;         /* seconds */
+	  long    tv_usec;        /* and microseconds */
+  };
+
+#endif
+
 int lwip_accept(int s, struct sockaddr *addr, int *addrlen);
 int lwip_bind(int s, struct sockaddr *name, int namelen);
 int lwip_shutdown(int s, int how);
@@ -184,7 +203,7 @@ int lwip_sendto(int s, void *dataptr, int size, unsigned int flags,
 int lwip_socket(int domain, int type, int protocol);
 int lwip_write(int s, void *dataptr, int size);
 int lwip_select(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset,
-                const struct timeval *timeout);
+                struct timeval *timeout);
 int lwip_ioctl(int s, long cmd, void *argp);
 
 #ifdef LWIP_COMPAT_SOCKETS