* 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_virtual.cc b/winsup/cygwin/fhandler_virtual.cc
index b0a7f07d8..e2b725084 100644
--- a/winsup/cygwin/fhandler_virtual.cc
+++ b/winsup/cygwin/fhandler_virtual.cc
@@ -93,13 +93,13 @@ fhandler_virtual::opendir (path_conv& pc)
   return res;
 }
 
-__off64_t fhandler_virtual::telldir (DIR * dir)
+_off64_t fhandler_virtual::telldir (DIR * dir)
 {
   return dir->__d_position;
 }
 
 void
-fhandler_virtual::seekdir (DIR * dir, __off64_t loc)
+fhandler_virtual::seekdir (DIR * dir, _off64_t loc)
 {
   dir->__d_position = loc;
   return;
@@ -118,15 +118,15 @@ fhandler_virtual::closedir (DIR * dir)
   return 0;
 }
 
-__off64_t
-fhandler_virtual::lseek (__off64_t offset, int whence)
+_off64_t
+fhandler_virtual::lseek (_off64_t offset, int whence)
 {
   /*
    * On Linux, when you lseek within a /proc file,
    * the contents of the file are updated.
    */
   if (!fill_filebuf ())
-    return (__off64_t) -1;
+    return (_off64_t) -1;
   switch (whence)
     {
     case SEEK_SET:
@@ -140,7 +140,7 @@ fhandler_virtual::lseek (__off64_t offset, int whence)
       break;
     default:
       set_errno (EINVAL);
-      return (__off64_t) -1;
+      return (_off64_t) -1;
     }
   return position;
 }