You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/06/10 00:47:34 UTC
svn commit: r953177 - in /harmony/enhanced/java/trunk/classlib:
depends/build/defines.mk
modules/luni/src/main/native/luni/shared/OSFileSystem.c
Author: hindessm
Date: Wed Jun 9 22:47:33 2010
New Revision: 953177
URL: http://svn.apache.org/viewvc?rev=953177&view=rev
Log:
Applying patch from "[#HARMONY-6542] java.io.RandomAccessFile.seek(long pos)
throughs exception on calls with "pos" set to values greater then 0x7FFFFFFF".
I'd still like to write a regression test but need help to find one that works
on windows.
Modified:
harmony/enhanced/java/trunk/classlib/depends/build/defines.mk
harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/shared/OSFileSystem.c
Modified: harmony/enhanced/java/trunk/classlib/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/depends/build/defines.mk?rev=953177&r1=953176&r2=953177&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/depends/build/defines.mk (original)
+++ harmony/enhanced/java/trunk/classlib/depends/build/defines.mk Wed Jun 9 22:47:33 2010
@@ -54,7 +54,7 @@ INCLUDES += -I$(HY_HDK)/include -I$(HY_H
include $(HY_HDK)/build/make/platform/$(HY_PLATFORM).mk
-DEFINES += -D_REENTRANT
+DEFINES += -D_REENTRANT -D_FILE_OFFSET_BITS=64
ifeq ($(HY_CFG),release)
OPT += $(HYRELEASECFLAGS)
Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/shared/OSFileSystem.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/shared/OSFileSystem.c?rev=953177&r1=953176&r2=953177&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/shared/OSFileSystem.c (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/shared/OSFileSystem.c Wed Jun 9 22:47:33 2010
@@ -164,7 +164,7 @@ JNIEXPORT jlong JNICALL Java_org_apache_
return -1;
}
- return (jlong) hyfile_seek ((IDATA) fd, (IDATA) offset, hywhence);
+ return (jlong) hyfile_seek ((IDATA) fd, (I_64) offset, hywhence);
}
/**