From 1f3b4018f9a06a2efc63cc669d1eb316f8a392b3 Mon Sep 17 00:00:00 2001
From: Davi Arnaut <Davi.Arnaut@Sun.COM>
Date: Tue, 10 Nov 2009 22:39:06 -0200
Subject: [PATCH] The FIONREAD macro could expand to a expression which is
 invalid to preporcessor conditionals. Instead use the autoconf generated
 macro to test the presence.

---
 vio/viosocket.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vio/viosocket.c b/vio/viosocket.c
index 055112f944e..aaaa8ceba97 100644
--- a/vio/viosocket.c
+++ b/vio/viosocket.c
@@ -372,6 +372,7 @@ void vio_in_addr(Vio *vio, struct in_addr *in)
 static my_bool socket_poll_read(my_socket sd, uint timeout)
 {
 #ifdef __WIN__
+  int res;
   my_socket fd= sd;
   fd_set readfds, errorfds;
   struct timeval tm;
@@ -424,7 +425,7 @@ static my_bool socket_peek_read(Vio *vio, uint *bytes)
     return TRUE;
   *bytes= len;
   return FALSE;
-#elif FIONREAD
+#elif FIONREAD_IN_SYS_IOCTL
   int len;
   if (ioctl(vio->sd, FIONREAD, &len) < 0)
     return TRUE;