aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Peach <mrpeach@users.sourceforge.net>2010-01-04 16:49:34 +0000
committerMartin Peach <mrpeach@users.sourceforge.net>2010-01-04 16:49:34 +0000
commit0f2f021304f0d8abac28f6126b3cea1c6fe0e5a1 (patch)
treede75e1da9d67fd6494fe10058ae7bc7878c400ae
parent9c1edcceb9e368ff328ec80a7c292e34db3a91ad (diff)
Had the wrong #include for ioctl...
svn path=/trunk/externals/mrpeach/; revision=12882
-rw-r--r--net/tcpserver.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/net/tcpserver.c b/net/tcpserver.c
index 3846f60..5a37de1 100644
--- a/net/tcpserver.c
+++ b/net/tcpserver.c
@@ -45,15 +45,12 @@
#include <sys/time.h>
#include <errno.h>
#include <sys/select.h>
+#include <sys/ioctl.h> /* linux has the SIOCOUTQ ioctl */
#define SOCKET_ERROR -1
#else
#include <winsock2.h>
#endif
-#ifdef __linux__
-/* The SIOCOUTQ ioctl call is in here */
-#include <linux/sockios.h>
-#endif // __linux__
#ifdef _MSC_VER
#define snprintf sprintf_s
@@ -209,7 +206,7 @@ static t_tcpserver_socketreceiver *tcpserver_socketreceiver_new(void *owner, t_t
{
freebytes(x, sizeof(*x));
x = NULL;
- error("%s_socketreceiver: unable to allocate %d bytes", objName, INBUFSIZE);
+ error("%s_socketreceiver: unable to allocate %ld bytes", objName, INBUFSIZE);
}
}
return (x);