* fhandler_disk_file.cc (fhandler_disk_file::touch_ctime): Replace

	GetSystemTime/SystemTimeToFileTime with GetSystemTimeAsFileTime.
	* times.cc (time_as_timestruc_t): Ditto.
	(time): Ditto.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 3a81828b5ac1d9218704a42841fed81fc408a96f..e62d17d4e761478d94617aa3af83850b17e35d93 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2005-03-01  Corinna Vinschen  <corinna@vinschen.de>
+
+       * fhandler_disk_file.cc (fhandler_disk_file::touch_ctime): Replace
+       GetSystemTime/SystemTimeToFileTime with GetSystemTimeAsFileTime.
+       * times.cc (time_as_timestruc_t): Ditto.
+       (time): Ditto.
+
 2005-03-01  Christopher Faylor  <cgf@timesys.com>
 
        * include/cygwin/version.h: Bump DLL minor number to 14.

diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index 6171f0b69cc1a53589aed1457e9a8a9f46c707cf..64b205a5554cf754668d992eba703e4b8f662adf 100644 (file)
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -388,11 +388,9 @@ fhandler_disk_file::fstat (struct __stat64 *buf)
 void
 fhandler_disk_file::touch_ctime (void)
 {
-  SYSTEMTIME st;
   FILETIME ft;
 
-  GetSystemTime (&st);
-  SystemTimeToFileTime (&st, &ft);
+  GetSystemTimeAsFileTime (&ft);
   if (!SetFileTime (get_io_handle (), &ft, NULL, NULL))
     debug_printf ("SetFileTime (%s) failed, %E", get_win32_name ());
   else

diff --git a/winsup/cygwin/times.cc b/winsup/cygwin/times.cc
index 5e4496308e708ce912fa75b7e19f4772baee4f1d..4c0909eb5c547024db69a2b9e55f65b76b4ce752 100644 (file)
--- a/winsup/cygwin/times.cc
+++ b/winsup/cygwin/times.cc
@@ -255,11 +255,9 @@ to_timestruc_t (FILETIME *ptr, timestruc_t *out)
 void __stdcall
 time_as_timestruc_t (timestruc_t * out)
 {
-  SYSTEMTIME systemtime;
   FILETIME filetime;
 
-  GetSystemTime (&systemtime);
-  SystemTimeToFileTime (&systemtime, &filetime);
+  GetSystemTimeAsFileTime (&filetime);
   to_timestruc_t (&filetime, out);
 }
 
@@ -269,11 +267,9 @@ extern "C" time_t
 time (time_t * ptr)
 {
   time_t res;
-  SYSTEMTIME systemtime;
   FILETIME filetime;
 
-  GetSystemTime (&systemtime);
-  SystemTimeToFileTime (&systemtime, &filetime);
+  GetSystemTimeAsFileTime (&filetime);
   res = to_time_t (&filetime);
   if (ptr)
     *ptr = res;