[MLton-commit] r4586
Stephen Weeks
MLton@mlton.org
Wed, 24 May 2006 16:35:22 -0700
Renamed variable to avoid gcc "shadows a global" warning.
----------------------------------------------------------------------
U mlton/branches/on-20050822-x86_64-branch/runtime/platform/recv.nonblock.c
----------------------------------------------------------------------
Modified: mlton/branches/on-20050822-x86_64-branch/runtime/platform/recv.nonblock.c
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/platform/recv.nonblock.c 2006-05-24 23:31:53 UTC (rev 4585)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/platform/recv.nonblock.c 2006-05-24 23:35:22 UTC (rev 4586)
@@ -1,10 +1,10 @@
/* Simulates MSG_DONTWAIT using fcntl() and O_NONBLOCK. */
-static void fd_modify(int fd, int flags, int add, int remove)
+static void fd_modify(int fd, int flags, int add, int shouldRemove)
{
if (flags & MSG_DONTWAIT) {
int f = fcntl(fd, F_GETFL);
- fcntl(fd, F_SETFL, (f | add) & ~remove);
+ fcntl(fd, F_SETFL, (f | add) & ~shouldRemove);
}
}