* dir.cc: Change __off32_t to _off_t and __off64_t to _off64_t

	throughout.
	* fhandler.cc: Ditto.
	* fhandler.h: Ditto.
	* fhandler_clipboard.cc: Ditto.
	* fhandler_disk_file.cc: Ditto.
	* fhandler_dsp.cc: Ditto.
	* fhandler_floppy.cc: Ditto.
	* fhandler_mem.cc: Ditto.
	* fhandler_proc.cc: Ditto.
	* fhandler_process.cc: Ditto.
	* fhandler_random.cc: Ditto.
	* fhandler_registry.cc: Ditto.
	* fhandler_tape.cc: Ditto.
	* fhandler_termios.cc: Ditto.
	* fhandler_virtual.cc: Ditto.
	* fhandler_zero.cc: Ditto.
	* mmap.cc: Ditto.
	* pipe.cc: Ditto.
	* syscalls.cc: Ditto.
	* winsup.h: Ditto.
	* include/cygwin/stat.h: Ditto.
	* include/cygwin/types.h: Ditto.  Remove definition of __off32_t
	and __off64_t.

1 files changed, 6 insertions, 6 deletions

diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index ddff658e9..f4f43e308 100644
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -824,10 +824,10 @@ fhandler_base::writev (const struct iovec *const iov, const int iovcnt,
   return write (buf, tot);
 }
 
-__off64_t
-fhandler_base::lseek (__off64_t offset, int whence)
+_off64_t
+fhandler_base::lseek (_off64_t offset, int whence)
 {
-  __off64_t res;
+  _off64_t res;
 
   /* 9x/Me doesn't support 64bit offsets.  We trap that here and return
      EINVAL.  It doesn't make sense to simulate bigger offsets by a
@@ -838,7 +838,7 @@ fhandler_base::lseek (__off64_t offset, int whence)
     {
       debug_printf ("Win9x, offset not 32 bit.");
       set_errno (EINVAL);
-      return (__off64_t)-1;
+      return (_off64_t)-1;
     }
 
   /* Seeks on text files is tough, we rewind and read till we get to the
@@ -1274,7 +1274,7 @@ fhandler_base::readdir (DIR *)
   return NULL;
 }
 
-__off64_t
+_off64_t
 fhandler_base::telldir (DIR *)
 {
   set_errno (ENOTDIR);
@@ -1282,7 +1282,7 @@ fhandler_base::telldir (DIR *)
 }
 
 void
-fhandler_base::seekdir (DIR *, __off64_t)
+fhandler_base::seekdir (DIR *, _off64_t)
 {
   set_errno (ENOTDIR);
   return;