* 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, 33 insertions, 33 deletions

diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index 445af49d8..3c4947dae 100644
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -310,13 +310,13 @@ class fhandler_base
   virtual int write (const void *ptr, size_t len);
   virtual ssize_t readv (const struct iovec *, int iovcnt, ssize_t tot = -1);
   virtual ssize_t writev (const struct iovec *, int iovcnt, ssize_t tot = -1);
-  virtual __off64_t lseek (__off64_t offset, int whence);
+  virtual _off64_t lseek (_off64_t offset, int whence);
   virtual int lock (int, struct flock *);
   virtual void dump ();
   virtual int dup (fhandler_base *child);
 
   virtual HANDLE mmap (caddr_t *addr, size_t len, DWORD access,
-		       int flags, __off64_t off);
+		       int flags, _off64_t off);
   virtual int munmap (HANDLE h, caddr_t addr, size_t len);
   virtual int msync (HANDLE h, caddr_t addr, size_t len, int flags);
   virtual BOOL fixup_mmap_after_fork (HANDLE h, DWORD access, DWORD offset,
@@ -369,8 +369,8 @@ class fhandler_base
   virtual void set_eof () {}
   virtual DIR *opendir (path_conv& pc);
   virtual dirent *readdir (DIR *);
-  virtual __off64_t telldir (DIR *);
-  virtual void seekdir (DIR *, __off64_t);
+  virtual _off64_t telldir (DIR *);
+  virtual void seekdir (DIR *, _off64_t);
   virtual void rewinddir (DIR *);
   virtual int closedir (DIR *);
 };
@@ -424,7 +424,7 @@ class fhandler_socket: public fhandler_base
 
   int ioctl (unsigned int cmd, void *);
   int fcntl (int cmd, void *);
-  __off64_t lseek (__off64_t, int) { return 0; }
+  _off64_t lseek (_off64_t, int) { return 0; }
   int shutdown (int how);
   int close ();
   void hclose (HANDLE) {close ();}
@@ -462,7 +462,7 @@ class fhandler_pipe: public fhandler_base
   unsigned id;
  public:
   fhandler_pipe (DWORD devtype);
-  __off64_t lseek (__off64_t offset, int whence);
+  _off64_t lseek (_off64_t offset, int whence);
   select_record *select_read (select_record *s);
   select_record *select_write (select_record *s);
   select_record *select_except (select_record *s);
@@ -537,7 +537,7 @@ class fhandler_dev_floppy: public fhandler_dev_raw
   virtual int open (path_conv *, int flags, mode_t mode = 0);
   virtual int close (void);
 
-  virtual __off64_t lseek (__off64_t offset, int whence);
+  virtual _off64_t lseek (_off64_t offset, int whence);
 
   virtual int ioctl (unsigned int cmd, void *buf);
 };
@@ -560,7 +560,7 @@ class fhandler_dev_tape: public fhandler_dev_raw
   virtual int open (path_conv *, int flags, mode_t mode = 0);
   virtual int close (void);
 
-  virtual __off64_t lseek (__off64_t offset, int whence);
+  virtual _off64_t lseek (_off64_t offset, int whence);
 
   virtual int __stdcall fstat (struct __stat64 *buf, path_conv *) __attribute__ ((regparm (3)));
 
@@ -607,15 +607,15 @@ class fhandler_disk_file: public fhandler_base
   int __stdcall fstat_by_handle (struct __stat64 *buf, path_conv *pc) __attribute__ ((regparm (3)));
   int __stdcall fstat_by_name (struct __stat64 *buf, path_conv *pc) __attribute__ ((regparm (3)));
 
-  HANDLE mmap (caddr_t *addr, size_t len, DWORD access, int flags, __off64_t off);
+  HANDLE mmap (caddr_t *addr, size_t len, DWORD access, int flags, _off64_t off);
   int munmap (HANDLE h, caddr_t addr, size_t len);
   int msync (HANDLE h, caddr_t addr, size_t len, int flags);
   BOOL fixup_mmap_after_fork (HANDLE h, DWORD access, DWORD offset,
 			      DWORD size, void *address);
   DIR *opendir (path_conv& pc);
   struct dirent *readdir (DIR *);
-  __off64_t telldir (DIR *);
-  void seekdir (DIR *, __off64_t);
+  _off64_t telldir (DIR *);
+  void seekdir (DIR *, _off64_t);
   void rewinddir (DIR *);
   int closedir (DIR *);
 };
@@ -631,8 +631,8 @@ class fhandler_cygdrive: public fhandler_disk_file
   fhandler_cygdrive (int unit);
   DIR *opendir (path_conv& pc);
   struct dirent *readdir (DIR *);
-  __off64_t telldir (DIR *);
-  void seekdir (DIR *, __off64_t);
+  _off64_t telldir (DIR *);
+  void seekdir (DIR *, _off64_t);
   void rewinddir (DIR *);
   int closedir (DIR *);
   int __stdcall fstat (struct __stat64 *buf, path_conv *pc) __attribute__ ((regparm (3)));
@@ -668,7 +668,7 @@ class fhandler_serial: public fhandler_base
   int ioctl (unsigned int cmd, void *);
   int tcsetattr (int a, const struct termios *t);
   int tcgetattr (struct termios *t);
-  __off64_t lseek (__off64_t, int) { return 0; }
+  _off64_t lseek (_off64_t, int) { return 0; }
   int tcflush (int);
   void dump ();
   int is_tty () { return 1; }
@@ -719,7 +719,7 @@ class fhandler_termios: public fhandler_base
   void fixup_after_fork (HANDLE);
   void fixup_after_exec (HANDLE parent) { fixup_after_fork (parent); }
   void echo_erase (int force = 0);
-  virtual __off64_t lseek (__off64_t, int);
+  virtual _off64_t lseek (_off64_t, int);
 };
 
 enum ansi_intensity
@@ -911,7 +911,7 @@ class fhandler_tty_slave: public fhandler_tty_common
   int dup (fhandler_base *child);
   void fixup_after_fork (HANDLE parent);
 
-  __off64_t lseek (__off64_t, int) { return 0; }
+  _off64_t lseek (_off64_t, int) { return 0; }
   select_record *select_read (select_record *s);
   int cygserver_attach_tty (HANDLE*, HANDLE*);
 };
@@ -938,7 +938,7 @@ class fhandler_pty_master: public fhandler_tty_common
   int tcflush (int);
   int ioctl (unsigned int cmd, void *);
 
-  __off64_t lseek (__off64_t, int) { return 0; }
+  _off64_t lseek (_off64_t, int) { return 0; }
   char *ptsname ();
 
   void set_close_on_exec (int val);
@@ -977,7 +977,7 @@ class fhandler_dev_zero: public fhandler_base
   int open (path_conv *, int flags, mode_t mode = 0);
   int write (const void *ptr, size_t len);
   void __stdcall read (void *ptr, size_t& len) __attribute__ ((regparm (3)));
-  __off64_t lseek (__off64_t offset, int whence);
+  _off64_t lseek (_off64_t offset, int whence);
 
   void dump ();
 };
@@ -999,7 +999,7 @@ class fhandler_dev_random: public fhandler_base
   int open (path_conv *, int flags, mode_t mode = 0);
   int write (const void *ptr, size_t len);
   void __stdcall read (void *ptr, size_t& len) __attribute__ ((regparm (3)));
-  __off64_t lseek (__off64_t offset, int whence);
+  _off64_t lseek (_off64_t offset, int whence);
   int close (void);
   int dup (fhandler_base *child);
 
@@ -1011,7 +1011,7 @@ class fhandler_dev_mem: public fhandler_base
  protected:
   int unit;
   DWORD mem_size;
-  __off64_t pos;
+  _off64_t pos;
 
  public:
   fhandler_dev_mem (int unit);
@@ -1020,12 +1020,12 @@ class fhandler_dev_mem: public fhandler_base
   int open (path_conv *, int flags, mode_t mode = 0);
   int write (const void *ptr, size_t ulen);
   void __stdcall read (void *ptr, size_t& len) __attribute__ ((regparm (3)));
-  __off64_t lseek (__off64_t offset, int whence);
+  _off64_t lseek (_off64_t offset, int whence);
   int close (void);
   int __stdcall fstat (struct __stat64 *buf, path_conv *) __attribute__ ((regparm (3)));
   int dup (fhandler_base *child);
 
-  HANDLE mmap (caddr_t *addr, size_t len, DWORD access, int flags, __off64_t off);
+  HANDLE mmap (caddr_t *addr, size_t len, DWORD access, int flags, _off64_t off);
   int munmap (HANDLE h, caddr_t addr, size_t len);
   int msync (HANDLE h, caddr_t addr, size_t len, int flags);
   BOOL fixup_mmap_after_fork (HANDLE h, DWORD access, DWORD offset,
@@ -1042,7 +1042,7 @@ class fhandler_dev_clipboard: public fhandler_base
   int open (path_conv *, int flags, mode_t mode = 0);
   int write (const void *ptr, size_t len);
   void __stdcall read (void *ptr, size_t& len) __attribute__ ((regparm (3)));
-  __off64_t lseek (__off64_t offset, int whence);
+  _off64_t lseek (_off64_t offset, int whence);
   int close (void);
 
   int dup (fhandler_base *child);
@@ -1050,7 +1050,7 @@ class fhandler_dev_clipboard: public fhandler_base
   void dump ();
 
  private:
-  __off64_t pos;
+  _off64_t pos;
   void *membuffer;
   size_t msize;
   bool eof;
@@ -1068,7 +1068,7 @@ class fhandler_windows: public fhandler_base
   int write (const void *ptr, size_t len);
   void __stdcall read (void *ptr, size_t& len) __attribute__ ((regparm (3)));
   int ioctl (unsigned int cmd, void *);
-  __off64_t lseek (__off64_t, int) { return 0; }
+  _off64_t lseek (_off64_t, int) { return 0; }
   int close (void) { return 0; }
 
   void set_close_on_exec (int val);
@@ -1094,7 +1094,7 @@ class fhandler_dev_dsp : public fhandler_base
   int write (const void *ptr, size_t len);
   void __stdcall read (void *ptr, size_t& len) __attribute__ ((regparm (3)));
   int ioctl (unsigned int cmd, void *);
-  __off64_t lseek (__off64_t, int);
+  _off64_t lseek (_off64_t, int);
   int close (void);
   int dup (fhandler_base * child);
   void dump (void);
@@ -1106,8 +1106,8 @@ class fhandler_virtual : public fhandler_base
  protected:
   char *filebuf;
   size_t bufalloc;
-  __off64_t filesize;
-  __off64_t position;
+  _off64_t filesize;
+  _off64_t position;
   int fileid; // unique within each class
  public:
 
@@ -1116,13 +1116,13 @@ class fhandler_virtual : public fhandler_base
 
   virtual int exists();
   DIR *opendir (path_conv& pc);
-  __off64_t telldir (DIR *);
-  void seekdir (DIR *, __off64_t);
+  _off64_t telldir (DIR *);
+  void seekdir (DIR *, _off64_t);
   void rewinddir (DIR *);
   int closedir (DIR *);
   int write (const void *ptr, size_t len);
   void __stdcall read (void *ptr, size_t& len) __attribute__ ((regparm (3)));
-  __off64_t lseek (__off64_t, int);
+  _off64_t lseek (_off64_t, int);
   int dup (fhandler_base * child);
   int open (path_conv *, int flags, mode_t mode = 0);
   int close (void);
@@ -1153,8 +1153,8 @@ class fhandler_registry: public fhandler_proc
   fhandler_registry ();
   int exists();
   struct dirent *readdir (DIR *);
-  __off64_t telldir (DIR *);
-  void seekdir (DIR *, __off64_t);
+  _off64_t telldir (DIR *);
+  void seekdir (DIR *, _off64_t);
   void rewinddir (DIR *);
   int closedir (DIR *);