commit 399901e0548738611e4276352222f380378ae001
author Ge van Geldorp <ge@gse.nl> Fri Jan 23 01:51:33 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Jan 23 01:51:33 2004 +0000
tree 24b1390ea8d71ef2f7209cd77bb32891b6316753
parent 0bd5b378d7118e59890578d398c31d43d608375c

Rename LARGE_INTEGER and ULARGE_INTEGER members "s" to "u" to conform
with PSDK.

dlls/ntdll/time.c

diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c
index 048c549..b88ff8f 100644
--- a/dlls/ntdll/time.c
+++ b/dlls/ntdll/time.c
@@ -519,7 +519,7 @@
  */
 BOOLEAN WINAPI RtlTimeToSecondsSince1970( const LARGE_INTEGER *Time, LPDWORD Seconds )
 {
-    ULONGLONG tmp = ((ULONGLONG)Time->s.HighPart << 32) | Time->s.LowPart;
+    ULONGLONG tmp = ((ULONGLONG)Time->u.HighPart << 32) | Time->u.LowPart;
     tmp = RtlLargeIntegerDivide( tmp, 10000000, NULL );
     tmp -= SECS_1601_TO_1970;
     if (tmp > 0xffffffff) return FALSE;
@@ -542,7 +542,7 @@
  */
 BOOLEAN WINAPI RtlTimeToSecondsSince1980( const LARGE_INTEGER *Time, LPDWORD Seconds )
 {
-    ULONGLONG tmp = ((ULONGLONG)Time->s.HighPart << 32) | Time->s.LowPart;
+    ULONGLONG tmp = ((ULONGLONG)Time->u.HighPart << 32) | Time->u.LowPart;
     tmp = RtlLargeIntegerDivide( tmp, 10000000, NULL );
     tmp -= SECS_1601_TO_1980;
     if (tmp > 0xffffffff) return FALSE;
@@ -565,8 +565,8 @@
 void WINAPI RtlSecondsSince1970ToTime( DWORD Seconds, LARGE_INTEGER *Time )
 {
     ULONGLONG secs = Seconds * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970;
-    Time->s.LowPart  = (DWORD)secs;
-    Time->s.HighPart = (DWORD)(secs >> 32);
+    Time->u.LowPart  = (DWORD)secs;
+    Time->u.HighPart = (DWORD)(secs >> 32);
 }
 
 /******************************************************************************
@@ -584,8 +584,8 @@
 void WINAPI RtlSecondsSince1980ToTime( DWORD Seconds, LARGE_INTEGER *Time )
 {
     ULONGLONG secs = Seconds * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1980;
-    Time->s.LowPart  = (DWORD)secs;
-    Time->s.HighPart = (DWORD)(secs >> 32);
+    Time->u.LowPart  = (DWORD)secs;
+    Time->u.HighPart = (DWORD)(secs >> 32);
 }
 
 /******************************************************************************