diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2003-04-01 16:11:41 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2003-04-01 16:11:41 +0000 |
| commit | 1727fba007956454046c6cf7a34c9b229f10032e (patch) | |
| tree | 3ed9fd3cb5634c33eabdb23c0edbec9b049766f4 /winsup/cygwin/fhandler_floppy.cc | |
| parent | 5340a2ed6daff6dba00a3f12b94fa1a350cee7db (diff) | |
| download | cygnal-1727fba007956454046c6cf7a34c9b229f10032e.tar.gz cygnal-1727fba007956454046c6cf7a34c9b229f10032e.tar.bz2 cygnal-1727fba007956454046c6cf7a34c9b229f10032e.zip | |
* 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.
Diffstat (limited to 'winsup/cygwin/fhandler_floppy.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_floppy.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/winsup/cygwin/fhandler_floppy.cc b/winsup/cygwin/fhandler_floppy.cc index e5da2418d..83d41ea07 100644 --- a/winsup/cygwin/fhandler_floppy.cc +++ b/winsup/cygwin/fhandler_floppy.cc @@ -79,16 +79,16 @@ fhandler_dev_floppy::close (void) return fhandler_dev_raw::close (); } -__off64_t -fhandler_dev_floppy::lseek (__off64_t offset, int whence) +_off64_t +fhandler_dev_floppy::lseek (_off64_t offset, int whence) { int ret; char buf[512]; - __off64_t drive_size = 0; - __off64_t lloffset = offset; - __off64_t current_position; - __off64_t sector_aligned_offset; - __off64_t bytes_left; + _off64_t drive_size = 0; + _off64_t lloffset = offset; + _off64_t current_position; + _off64_t sector_aligned_offset; + _off64_t bytes_left; DWORD low; LONG high = 0; @@ -142,7 +142,7 @@ fhandler_dev_floppy::lseek (__off64_t offset, int whence) __seterrno (); return -1; } - current_position = low + ((__off64_t) high << 32); + current_position = low + ((_off64_t) high << 32); if (is_writing) current_position += devbufend - devbufstart; else @@ -195,8 +195,8 @@ fhandler_dev_floppy::ioctl (unsigned int cmd, void *buf) DISK_GEOMETRY di; PARTITION_INFORMATION pi; DWORD bytes_read; - __off64_t drive_size = 0; - __off64_t start = 0; + _off64_t drive_size = 0; + _off64_t start = 0; switch (cmd) { case HDIO_GETGEO: @@ -271,7 +271,7 @@ fhandler_dev_floppy::ioctl (unsigned int cmd, void *buf) if (cmd == BLKGETSIZE) *(long *)buf = drive_size >> 9UL; else - *(__off64_t *)buf = drive_size; + *(_off64_t *)buf = drive_size; return 0; } case BLKRRPART: |