harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From py...@apache.org
Subject svn commit: r517562 - /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/OSFileSystemLinux32.c
Date Tue, 13 Mar 2007 06:32:40 GMT
Author: pyang
Date: Mon Mar 12 23:32:39 2007
New Revision: 517562

URL: http://svn.apache.org/viewvc?view=rev&rev=517562
Log:
revert patch for HARMONY-3334( [classlib][luni-native] Native Method XXX_transferImpl in luni/src/main/native/luni/unix/OSFileSystemLinux32.c
did not handle endian properly), which fails on x86_64

Modified:
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/OSFileSystemLinux32.c

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/OSFileSystemLinux32.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/OSFileSystemLinux32.c?view=diff&rev=517562&r1=517561&r2=517562
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/OSFileSystemLinux32.c
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/OSFileSystemLinux32.c
Mon Mar 12 23:32:39 2007
@@ -245,12 +245,9 @@
   if(hysocketP == NULL)
     return -1;
   socket = hysocketP->sock;
-  //fix for HARMONY-3334, convert the jlong to int before (off_t *) to make it work 
-  //on both big endian and little endian architectures
-  int off = offset;
 #if !defined(FREEBSD)
-  return sendfile(socket,(int)fd,(off_t *)&off,(size_t)count);	
+  return sendfile(socket,(int)fd,(off_t *)&offset,(size_t)count);	
 #else
-  return sendfile(fd, socket, off, (size_t)count, NULL, NULL, 0);
+  return sendfile(fd, socket, offset, (size_t)count, NULL, NULL, 0);
 #endif
 }



Mime
View raw message