From 7b9e380f0362aad5dfa3e06e60fd6d06549e2306 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Thu, 11 Sep 2008 04:34:24 +0000
Subject: * cygheap.cc (creturn): Reorganize to avoid a new compiler
 warning/error. * dtable.cc (handle_to_fn): Ditto. * fhandler_console.cc
 (fhandler_console::read): Ditto. (fhandler_console::scroll_screen): Ditto.
 (dev_console::set_color): Ditto. * fhandler_dsp.cc (fhandler_dev_dsp::write):
 Ditto. (fhandler_dev_dsp::read): Ditto. * fhandler_tape.cc
 (mtinfo_drive::get_status): Ditto. * hookapi.cc (find_first_notloaded_dll):
 Ditto. * mmap.cc (msync): Ditto. * pipe.cc (pipesync::pipesync): Ditto. *
 sec_acl.cc (getace): Ditto. * sec_auth.cc (create_token): Ditto. (lsaauth):
 Ditto. * select.cc (peek_pipe): Ditto. * spawn.cc (av::fixup): Ditto. *
 syscalls.cc (popen): Ditto. * tty.cc (tty::init_session): Ditto. * uinfo.cc
 (pwdgrp::load): Ditto. * fhandler.cc (fhandler_base::setup_overlapped):
 Ditto. (fhandler_base::wait_overlapped): Rename second use of res variable to
 wres or errors are not returned correctly. * dcrt0.cc: Remove obsolete
 variable. * dll_init.cc (release_upto): Fix typo involving incorrect use of
 '|'. * fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Avoid a
 compiler warning regarding coercing type-punned variables.
 (fhandler_base::fstat_by_name): Ditto.  fhandler_fifo.cc
 (fhandler_fifo::open_nonserver): Fix = vs.  == typo. (fhandler_fifo::wait):
 Add all conditions to switch statement to avoid a compiler warning. *
 fhandler_process.cc: Avoid unneeded initialization of variables to zero.
 (fhandler_socket::listen): Add braces around initializer. * flock.cc
 (inode_t::get_all_locks_list): Reorganize to avoid a compiler warning.  Fix
 problem with EWOULDBLOCK error return. * path.cc (GUID_shortcut): Use braces
 around struct initializer. (cygwin_conv_path): Reorganize to avoid a compiler
 warning. * random.cc (dummy): Mark variable as volatile to avoid a "used
 uninitialized" warning. * libc/getopt.c: Mark some variables as dllexport
 although gcc doesn't seem to do the right thing with them. *
 libc/minires-os-if.c (get_registry_dns_items): Coerce some function arguments
 to avoid a compiler warning.

---
 winsup/cygwin/fhandler_disk_file.cc | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'winsup/cygwin/fhandler_disk_file.cc')

diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index cbfa36a48..aa945f588 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -350,11 +350,11 @@ fhandler_base::fstat_by_handle (struct __stat64 *buf)
   pc.file_attributes (fai_buf.fai.BasicInformation.FileAttributes);
   return fstat_helper (buf,
 		   fai_buf.fai.BasicInformation.ChangeTime.QuadPart
-		   ? *(FILETIME *) &fai_buf.fai.BasicInformation.ChangeTime
-		   : *(FILETIME *) &fai_buf.fai.BasicInformation.LastWriteTime,
-		   *(FILETIME *) &fai_buf.fai.BasicInformation.LastAccessTime,
-		   *(FILETIME *) &fai_buf.fai.BasicInformation.LastWriteTime,
-		   *(FILETIME *) &fai_buf.fai.BasicInformation.CreationTime,
+		   ? *(FILETIME *) (void *) &fai_buf.fai.BasicInformation.ChangeTime
+		   : *(FILETIME *) (void *) &fai_buf.fai.BasicInformation.LastWriteTime,
+		   *(FILETIME *) (void *) &fai_buf.fai.BasicInformation.LastAccessTime,
+		   *(FILETIME *) (void *) &fai_buf.fai.BasicInformation.LastWriteTime,
+		   *(FILETIME *) (void *) &fai_buf.fai.BasicInformation.CreationTime,
 		   get_dev (),
 		   fai_buf.fai.StandardInformation.EndOfFile.QuadPart,
 		   fai_buf.fai.StandardInformation.AllocationSize.QuadPart,
@@ -417,11 +417,11 @@ fhandler_base::fstat_by_name (struct __stat64 *buf)
   pc.file_attributes (fdi_buf.fdi.FileAttributes);
   return fstat_helper (buf,
 		       fdi_buf.fdi.ChangeTime.QuadPart ?
-		       *(FILETIME *) &fdi_buf.fdi.ChangeTime :
-		       *(FILETIME *) &fdi_buf.fdi.LastWriteTime,
-		       *(FILETIME *) &fdi_buf.fdi.LastAccessTime,
-		       *(FILETIME *) &fdi_buf.fdi.LastWriteTime,
-		       *(FILETIME *) &fdi_buf.fdi.CreationTime,
+		       *(FILETIME *) (void *) &fdi_buf.fdi.ChangeTime :
+		       *(FILETIME *) (void *) &fdi_buf.fdi.LastWriteTime,
+		       *(FILETIME *) (void *) &fdi_buf.fdi.LastAccessTime,
+		       *(FILETIME *) (void *) &fdi_buf.fdi.LastWriteTime,
+		       *(FILETIME *) (void *) &fdi_buf.fdi.CreationTime,
 		       pc.fs_serial_number (),
 		       fdi_buf.fdi.EndOfFile.QuadPart,
 		       fdi_buf.fdi.AllocationSize.QuadPart,
@@ -434,10 +434,10 @@ too_bad:
   /* Arbitrary value: 2006-12-01 */
   RtlSecondsSince1970ToTime (1164931200L, &ft);
   return fstat_helper (buf,
-		       *(FILETIME *) &ft,
-		       *(FILETIME *) &ft,
-		       *(FILETIME *) &ft,
-		       *(FILETIME *) &ft,
+		       *(FILETIME *) (void *) &ft,
+		       *(FILETIME *) (void *) &ft,
+		       *(FILETIME *) (void *) &ft,
+		       *(FILETIME *) (void *) &ft,
 		       0,
 		       0ULL,
 		       -1LL,
-- 
cgit v1.2.3