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

fix Windows and GCC 3.4 builds

Browse Source
This commit is contained in:
Joel Dice 2011-03-26 11:45:33 -06:00
parent ba0cc803a6
commit 3fd6af152f
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/classpath-openjdk.cpp
View File

@ -952,6 +952,10 @@ class ZipFile {
Entry(int64_t entry): Entry(int64_t entry):
hash(0), start(0), next(0), entry(entry) hash(0), start(0), next(0), entry(entry)
{ } { }
Entry():
hash(0), start(0), next(0), entry(0)
{ }
unsigned hash; unsigned hash;
const uint8_t* start; const uint8_t* start;
@ -4383,7 +4387,14 @@ EXPORT(JVM_SetLength)(jint fd, jlong length)
return -1; return -1;
} }
if (SetEndOfFile(h, length)) { long high = length >> 32;
DWORD r = SetFilePointer(h, static_cast<long>(length), &high, FILE_BEGIN);
if (r == 0xFFFFFFFF and GetLastError() != NO_ERROR) {
errno = EIO;
return -1;
}
if (SetEndOfFile(h)) {
return 0; return 0;
} else { } else {
errno = EIO; errno = EIO;
@ -4505,7 +4516,14 @@ EXPORT(JVM_SendTo)(jint, char*, int,
extern "C" JNIEXPORT jint JNICALL extern "C" JNIEXPORT jint JNICALL
EXPORT(JVM_SocketAvailable)(jint socket, jint* count) EXPORT(JVM_SocketAvailable)(jint socket, jint* count)
{ {
#ifdef PLATFORM_WINDOWS
unsigned long c = *count;
int r = ioctlsocket(socket, FIONREAD, &c);
*count = c;
return r;
#else
return ioctl(socket, FIONREAD, count) < 0 ? 0 : 1; return ioctl(socket, FIONREAD, count) < 0 ? 0 : 1;
#endif
} }
extern "C" JNIEXPORT jint JNICALL extern "C" JNIEXPORT jint JNICALL