ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-19 03:06:36 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

use closesocket instead of close on Windows

Browse Source 
MinGW's close apparently does nothing, and MSVC's headers don't even
declare it, so closesocket is the way to go.
This commit is contained in:
Joel Dice 2010-06-04 18:45:13 -06:00
parent 8c8f41b5e8
commit f3a1c3253e
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
classpath/java-nio.cpp
View File

@ -56,13 +56,15 @@ charsToArray(JNIEnv* e, const char* s)
return a;
}
#ifdef _MSC_VER
inline void
close(int socket)
doClose(int socket)
{
#ifdef PLATFORM_WINDOWS
closesocket(socket);
}
#else
close(socket);
#endif
}
inline jbyteArray
errorString(JNIEnv* e, int n)
@ -528,7 +530,7 @@ Java_java_nio_channels_SocketChannel_natCloseSocket(JNIEnv *,
jclass,
jint socket)
{
close(socket);
doClose(socket);
}
namespace {
@ -562,9 +564,9 @@ class Pipe {
}
void dispose() {
if (listener_ >= 0) ::close(listener_);
if (reader_ >= 0) ::close(reader_);
if (writer_ >= 0) ::close(writer_);
if (listener_ >= 0) ::doClose(listener_);
if (reader_ >= 0) ::doClose(reader_);
if (writer_ >= 0) ::doClose(writer_);
}
bool connected() {
@ -615,8 +617,8 @@ class Pipe {
}
void dispose() {
::close(pipe[0]);
::close(pipe[1]);
::doClose(pipe[0]);
::doClose(pipe[1]);
open_ = false;
}