diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2011-03-29 10:42:11 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2011-03-29 10:42:11 +0000 |
| commit | 5f660ecf247e43918946a84a164269ae8082e73f (patch) | |
| tree | 466bd7fcbd83ad3d6b2be0de48ffcfc5c6548ae1 /winsup/cygwin/fhandler_floppy.cc | |
| parent | cabe8aa22ae768527ebb921ece53b14a2d0ca7ca (diff) | |
| download | cygnal-5f660ecf247e43918946a84a164269ae8082e73f.tar.gz cygnal-5f660ecf247e43918946a84a164269ae8082e73f.tar.bz2 cygnal-5f660ecf247e43918946a84a164269ae8082e73f.zip | |
* autoload.cc (UuidCreate): Remove.
(UuidCreateSequential): Remove.
* passwd.cc (internal_getpwsid): Avoid a strict-aliasing compiler
error with gcc 4.5.1.
* fhandler_floppy.cc (fhandler_dev_floppy::get_drive_info): Ditto.
* ntdll.h (NtAllocateUuids): Declare.
* syscalls.cc (gethostid): Use NtAllocateUuids function rather than
UuidCreateSequential/UuidCreate to get rid of rpcrt4 dependency.
Diffstat (limited to 'winsup/cygwin/fhandler_floppy.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_floppy.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/winsup/cygwin/fhandler_floppy.cc b/winsup/cygwin/fhandler_floppy.cc index 5ebcd14cd..a5adcae6e 100644 --- a/winsup/cygwin/fhandler_floppy.cc +++ b/winsup/cygwin/fhandler_floppy.cc @@ -41,6 +41,7 @@ fhandler_dev_floppy::get_drive_info (struct hd_geometry *geo) char dbuf[256]; char pbuf[256]; + DISK_GEOMETRY_EX *dix = NULL; DISK_GEOMETRY *di = NULL; PARTITION_INFORMATION_EX *pix = NULL; PARTITION_INFORMATION *pi = NULL; @@ -57,7 +58,8 @@ fhandler_dev_floppy::get_drive_info (struct hd_geometry *geo) __seterrno (); else { - di = &((DISK_GEOMETRY_EX *) dbuf)->Geometry; + dix = (DISK_GEOMETRY_EX *) dbuf; + di = &dix->Geometry; if (!DeviceIoControl (get_handle (), IOCTL_DISK_GET_PARTITION_INFO_EX, NULL, 0, pbuf, 256, &bytes_read, NULL)) |