Backport: 2005-09-26 Sebastien Pouliot <sebastien@ximian.com>

	* io.c: Apply patch from #76192 (Can't write files past 2gb on AMD64
	(x86_64)) for Brion on IRC (Dick approved it).

svn path=/branches/mono-1-1-9/mono/; revision=50809

diff --git a/mono/io-layer/ChangeLog b/mono/io-layer/ChangeLog
index 1cd562fdd5a54c995c20591d46a0c2a4d30cd6e2..19ee14aca039dc104ad188c86b5a91ab536ae3f9 100644 (file)
--- a/mono/io-layer/ChangeLog
+++ b/mono/io-layer/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-26  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * io.c: Apply patch from #76192 (Can't write files past 2gb on AMD64 
+       (x86_64)) for Brion on IRC (Dick approved it).
+
 2005-09-23  Dick Porter  <dick@ximian.com>
 
        * processes.c: Don't wait for processes that have already been

diff --git a/mono/io-layer/io.c b/mono/io-layer/io.c
index f831b22d06e900ddb795bcce7e6b568083fed499..4037f72ef9026a0a4d170b1dd8f747067727bc1f 100644 (file)
--- a/mono/io-layer/io.c
+++ b/mono/io-layer/io.c
@@ -491,7 +491,7 @@ static guint32 file_seek(gpointer handle, gint32 movedistance,
                          offset, movedistance);
 #endif
        } else {
-               offset=((gint64) *highmovedistance << 32) | (unsigned long)movedistance;
+               offset=((gint64) *highmovedistance << 32) | (guint32)movedistance;
                
 #ifdef DEBUG
                g_message("%s: setting offset to %lld 0x%llx (high %d 0x%x, low %d 0x%x)", __func__, offset, offset, *highmovedistance, *highmovedistance, movedistance, movedistance);