[frontierkernel-commits] Frontier/Common/source timedate.c,1.4,1.5

[Terry T. <ter...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17013/Frontier/Common/source

Modified Files:
	timedate.c 
Log Message:
Fixes for GNU/WINE.

Index: timedate.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/timedate.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** timedate.c	9 Dec 2004 20:26:51 -0000	1.4
--- timedate.c	3 Jan 2005 00:56:01 -0000	1.5
***************
*** 469,477 ****
  	LARGE_INTEGER nowtime;
  
! 	basetime.HighPart = 0x0153b281;
! 	basetime.LowPart = 0xe0fb4000;
  
! 	nowtime.HighPart = (*filetime).dwHighDateTime;
! 	nowtime.LowPart = (*filetime).dwLowDateTime;
  
  	nowtime.QuadPart = nowtime.QuadPart - basetime.QuadPart;
--- 469,477 ----
  	LARGE_INTEGER nowtime;
  
! 	basetime.u.HighPart = 0x0153b281;
! 	basetime.u.LowPart = 0xe0fb4000;
  
! 	nowtime.u.HighPart = (*filetime).dwHighDateTime;
! 	nowtime.u.LowPart = (*filetime).dwLowDateTime;
  
  	nowtime.QuadPart = nowtime.QuadPart - basetime.QuadPart;
***************
*** 487,498 ****
  	LARGE_INTEGER mul;
  	
! 	basetime.HighPart = 0x0153b281;
! 	basetime.LowPart = 0xe0fb4000;
  
! 	mul.LowPart = 10000000;
! 	mul.HighPart = 0;
  
! 	nowtime.LowPart = seconds;
! 	nowtime.HighPart = 0;
  
  	nowtime.QuadPart = nowtime.QuadPart * mul.QuadPart;
--- 487,498 ----
  	LARGE_INTEGER mul;
  	
! 	basetime.u.HighPart = 0x0153b281;
! 	basetime.u.LowPart = 0xe0fb4000;
  
! 	mul.u.LowPart = 10000000;
! 	mul.u.HighPart = 0;
  
! 	nowtime.u.LowPart = seconds;
! 	nowtime.u.HighPart = 0;
  
  	nowtime.QuadPart = nowtime.QuadPart * mul.QuadPart;
***************
*** 500,505 ****
  	nowtime.QuadPart = nowtime.QuadPart + basetime.QuadPart;
  
! 	(*filetime).dwHighDateTime = nowtime.HighPart;
! 	(*filetime).dwLowDateTime = nowtime.LowPart;
  	} /*secondstofiletime*/
  
--- 500,505 ----
  	nowtime.QuadPart = nowtime.QuadPart + basetime.QuadPart;
  
! 	(*filetime).dwHighDateTime = nowtime.u.HighPart;
! 	(*filetime).dwLowDateTime = nowtime.u.LowPart;
  	} /*secondstofiletime*/
  
***************
*** 2370,2374 ****
  		if (errSet != 0 && i <= tokCount)
  		{
! 			err->stringPosition = (o + i)->pos - strIn;
  			err->auxilaryPointer = NULL;
  		}
--- 2370,2374 ----
  		if (errSet != 0 && i <= tokCount)
  		{
! 			err->stringPosition = (long)((o + i)->pos - (char *)strIn);	// TRT - 29 Dec 2004
  			err->auxilaryPointer = NULL;
  		}
***************
*** 2599,2603 ****
  		if (errSet != 0 && i <= tokCount)
  		{
! 			err->stringPosition = (o + i)->pos - strIn;
  			err->auxilaryPointer = NULL;
  		}
--- 2599,2603 ----
  		if (errSet != 0 && i <= tokCount)
  		{
! 			err->stringPosition = (long)((o + i)->pos - (char *)strIn);	// TRT - 29 Dec 2004
  			err->auxilaryPointer = NULL;
  		}