* Merge in cygwin-64bit-branch.

2013-04-23 09:44:36 +00:00
parent 1875ee55d3
commit 61522196c7
253 changed files with 10632 additions and 5055 deletions
--- a/winsup/cygwin/fhandler_zero.cc
+++ b/winsup/cygwin/fhandler_zero.cc
@ -47,8 +47,8 @@ fhandler_dev_zero::read (void *ptr, size_t& len)
  memset (ptr, 0, len);
 }

-_off64_t
-fhandler_dev_zero::lseek (_off64_t, int)
+off_t
+fhandler_dev_zero::lseek (off_t, int)
 {
  return 0;
 }