diff -ur sysutil.c work2/vsftpd-0.0.10/sysutil.c --- sysutil.c Wed Jan 31 03:39:15 2001 +++ sysutil.c Sat Feb 3 18:08:05 2001 @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include @@ -30,7 +30,12 @@ #include #include #include +#ifndef BSD #include +#endif +#ifdef BSD +#include +#endif #include #include #include @@ -38,6 +43,7 @@ #include #include #include +#include #include #include @@ -378,7 +384,11 @@ vsf_sysutil_set_nodelay(int fd) { int nodelay = 1; +#ifndef BSD int retval = setsockopt(fd, SOL_TCP, TCP_NODELAY, &nodelay, sizeof(nodelay)); +#else + int retval = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &nodelay, sizeof(nodelay)); +#endif if (retval != 0) { die("setsockopt"); @@ -413,7 +423,11 @@ int tos = IPTOS_THROUGHPUT; /* Ignore failure to set (maybe this IP stack demands privilege for this) */ +#ifndef BSD (void) setsockopt(fd, SOL_IP, IP_TOS, &tos, sizeof(tos)); +#else + (void) setsockopt(fd, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)); +#endif } int