Skip to content

Commit

Permalink
Unbreak the build - Ignore the fact that MSG_NOSIGNAL is not a member…
Browse files Browse the repository at this point in the history
… of SocketFlags.
  • Loading branch information
yebblies committed Jul 9, 2011
1 parent dce4147 commit 4840347
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions std/socket.d
Expand Up @@ -1495,7 +1495,7 @@ class Socket
{
static if (is(typeof(MSG_NOSIGNAL)))
{
flags = flags | MSG_NOSIGNAL;
flags = cast(SocketFlags)(flags | MSG_NOSIGNAL);
}
auto sent = .send(sock, buf.ptr, buf.length, cast(int)flags);
return sent;
Expand All @@ -1515,7 +1515,7 @@ class Socket
{
static if (is(typeof(MSG_NOSIGNAL)))
{
flags = flags | MSG_NOSIGNAL;
flags = cast(SocketFlags)(flags | MSG_NOSIGNAL);
}
return .sendto(sock, buf.ptr, buf.length, cast(int)flags, to.name(), to.nameLen());
}
Expand All @@ -1533,7 +1533,7 @@ class Socket
{
static if (is(typeof(MSG_NOSIGNAL)))
{
flags = flags | MSG_NOSIGNAL;
flags = cast(SocketFlags)(flags | MSG_NOSIGNAL);
}
return .sendto(sock, buf.ptr, buf.length, cast(int)flags, null, 0);
}
Expand Down

2 comments on commit 4840347

@dnadlinger
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks – this happened because of your fd8797a and my 5ae54cb interfering bad, should've tested it again after your commit was merged.

@yebblies
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it happens. If I find the time I'm planning to set something up which attempts to merge each pull request then run the tests on the result. Hopefully someone will beat me to it :)

Please sign in to comment.