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

Merge pull request #367 from lostdj/patch-6

Browse Source 
Fix some native and managed function signatures.
This commit is contained in:
Joel Dice 2014-11-11 14:33:51 -07:00
commit 78a0e207c0
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
classpath/java-net.cpp
View File

@ -28,44 +28,44 @@ extern "C" JNIEXPORT SOCKET JNICALL
extern "C" JNIEXPORT void JNICALL Java_java_net_Socket_connect(JNIEnv* e, extern "C" JNIEXPORT void JNICALL Java_java_net_Socket_connect(JNIEnv* e,
jclass, jclass,
SOCKET sock, jlong sock,
long addr, jlong addr,
short port) jshort port)
{ {
connect(e, sock, addr, port); connect(e, static_cast<SOCKET>(sock), addr, port);
} }
extern "C" JNIEXPORT void JNICALL Java_java_net_Socket_bind(JNIEnv* e, extern "C" JNIEXPORT void JNICALL Java_java_net_Socket_bind(JNIEnv* e,
jclass, jclass,
SOCKET sock, jlong sock,
long addr, jlong addr,
short port) jshort port)
{ {
bind(e, sock, addr, port); bind(e, static_cast<SOCKET>(sock), addr, port);
} }
extern "C" JNIEXPORT void JNICALL extern "C" JNIEXPORT void JNICALL
Java_java_net_Socket_abort(JNIEnv* e, jclass, SOCKET sock) Java_java_net_Socket_abort(JNIEnv* e, jclass, jlong sock)
{ {
abort(e, sock); abort(e, static_cast<SOCKET>(sock));
} }
extern "C" JNIEXPORT void JNICALL extern "C" JNIEXPORT void JNICALL
Java_java_net_Socket_close(JNIEnv* e, jclass, SOCKET sock) Java_java_net_Socket_close(JNIEnv* e, jclass, jlong sock)
{ {
close(e, sock); close(e, static_cast<SOCKET>(sock));
} }
extern "C" JNIEXPORT void JNICALL extern "C" JNIEXPORT void JNICALL
Java_java_net_Socket_closeOutput(JNIEnv* e, jclass, SOCKET sock) Java_java_net_Socket_closeOutput(JNIEnv* e, jclass, jlong sock)
{ {
close_output(e, sock); close_output(e, static_cast<SOCKET>(sock));
} }
extern "C" JNIEXPORT void JNICALL extern "C" JNIEXPORT void JNICALL
Java_java_net_Socket_closeInput(JNIEnv* e, jclass, SOCKET sock) Java_java_net_Socket_closeInput(JNIEnv* e, jclass, jlong sock)
{ {
close_input(e, sock); close_input(e, static_cast<SOCKET>(sock));
} }
extern "C" JNIEXPORT void JNICALL extern "C" JNIEXPORT void JNICALL

2
classpath/java/io/File.java
View File

@ -307,7 +307,7 @@ public class File implements Serializable {
private static native String readDir(long handle); private static native String readDir(long handle);
private static native long closeDir(long handle); private static native void closeDir(long handle);