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

Merge branch 'win64' into gnu

Browse Source 
Conflicts:

	makefile
	src/compile-x86.S
	src/x86.S
	src/x86.cpp
This commit is contained in:
Joel Dice
2009-07-25 20:48:36 -06:00
parent f869e5be21 f773c9e610
commit 27d863790c
14 changed files with 923 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classpath/java-lang.cpp
View File

@ -81,7 +81,7 @@ namespace {
int descriptor(JNIEnv* e, HANDLE h)
{
int fd = _open_osfhandle(reinterpret_cast<long>(h), 0);
int fd = _open_osfhandle(reinterpret_cast<intptr_t>(h), 0);
if (fd == -1) {
throwNew(e, "java/io/IOException", strerror(errno));
}