From 0922c5ab2da1106fdb9a750c2d71d0cd04146394 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 7 Apr 2010 15:21:32 +0200 Subject: [PATCH] Revert "socket-wrapper: not all systems have FIONREAD defined" This reverts commit 710aa773d54509de34404f9992c5058ddfa45f3b. We rely on FIONREAD in a lot of other parts in the code, so there's no need to have an ifdef for it in the socket_wrapper code. On tru64 FIONREAD is defined in and we include via "system/network.h". Tridge: maybe a HAVE_SYS_IOCTL_H was missing at the time you tried it on tru64? If we find a platform that doesn't support it, we need to bail out at configure time or provide a replacement in libreplace. metze --- lib/socket_wrapper/socket_wrapper.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/socket_wrapper/socket_wrapper.c b/lib/socket_wrapper/socket_wrapper.c index c7530c9a15a..9d732ee6529 100644 --- a/lib/socket_wrapper/socket_wrapper.c +++ b/lib/socket_wrapper/socket_wrapper.c @@ -2002,7 +2002,6 @@ _PUBLIC_ int swrap_ioctl(int s, int r, void *p) ret = real_ioctl(s, r, p); -#ifdef FIONREAD switch (r) { case FIONREAD: value = *((int *)p); @@ -2013,7 +2012,6 @@ _PUBLIC_ int swrap_ioctl(int s, int r, void *p) } break; } -#endif return ret; } -- 2.11.4.GIT