diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2013-04-23 09:44:36 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2013-04-23 09:44:36 +0000 |
| commit | 61522196c71593da09572fce9af9e0d7dad61bc3 (patch) | |
| tree | 9bf74facd67974fa2f780d6ce68b14eb7a94e371 /winsup/cygwin/fhandler_raw.cc | |
| parent | 1875ee55d31d3673059373c8f9837bf98f93c713 (diff) | |
| download | cygnal-61522196c71593da09572fce9af9e0d7dad61bc3.tar.gz cygnal-61522196c71593da09572fce9af9e0d7dad61bc3.tar.bz2 cygnal-61522196c71593da09572fce9af9e0d7dad61bc3.zip | |
* Merge in cygwin-64bit-branch.
Diffstat (limited to 'winsup/cygwin/fhandler_raw.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_raw.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/winsup/cygwin/fhandler_raw.cc b/winsup/cygwin/fhandler_raw.cc index cf6861f1f..04f40f387 100644 --- a/winsup/cygwin/fhandler_raw.cc +++ b/winsup/cygwin/fhandler_raw.cc @@ -36,7 +36,7 @@ fhandler_dev_raw::~fhandler_dev_raw () } int __reg2 -fhandler_dev_raw::fstat (struct __stat64 *buf) +fhandler_dev_raw::fstat (struct stat *buf) { debug_printf ("here"); @@ -95,7 +95,7 @@ fhandler_dev_raw::dup (fhandler_base *child, int flags) /* Create sector-aligned buffer */ fhc->devbufalloc = new char [devbufsiz + devbufalign]; fhc->devbuf = (char *) roundup2 ((uintptr_t) fhc->devbufalloc, - devbufalign); + (uintptr_t) devbufalign); } fhc->devbufstart = 0; fhc->devbufend = 0; @@ -121,7 +121,8 @@ fhandler_dev_raw::fixup_after_exec () { /* Create sector-aligned buffer */ devbufalloc = new char [devbufsiz + devbufalign]; - devbuf = (char *) roundup2 ((uintptr_t) devbufalloc, devbufalign); + devbuf = (char *) roundup2 ((uintptr_t) devbufalloc, + (uintptr_t) devbufalign); } devbufstart = 0; devbufend = 0; @@ -165,7 +166,7 @@ fhandler_dev_raw::ioctl (unsigned int cmd, void *buf) else if (!devbuf || op->rd_parm != devbufsiz) { char *buf = NULL; - _off64_t curpos = lseek (0, SEEK_CUR); + off_t curpos = lseek (0, SEEK_CUR); if (op->rd_parm > 1L) buf = new char [op->rd_parm + devbufalign]; @@ -174,7 +175,8 @@ fhandler_dev_raw::ioctl (unsigned int cmd, void *buf) delete [] devbufalloc; devbufalloc = buf; - devbuf = (char *) roundup2 ((uintptr_t) buf, devbufalign); + devbuf = (char *) roundup2 ((uintptr_t) buf, + (uintptr_t) devbufalign); devbufsiz = op->rd_parm ?: 1L; devbufstart = devbufend = 0; lseek (curpos, SEEK_SET); |