mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-06 16:47:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR libf2c/7384 (DATE_AND_TIME milliseconds field inactive on Windows)

Browse Source 
2002-09-14  Tim Prince  <tprince@computer.org>

	PR libf2c/7384
	* libU77/datetime_.c: Use GetLocalTime on MS-Windows.

From-SVN: r57142
This commit is contained in:
Tim Prince 2002-09-14 12:50:40 +00:00 committed by Toon Moene
parent c1b8db3f83
commit 958a4e4eee
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libf2c/ChangeLog
View File

@ -1,3 +1,8 @@
2002-09-14 Tim Prince <tprince@computer.org>
PR libf2c/7384
* libU77/datetime_.c: Use GetLocalTime on MS-Windows.
2002-08-31 Toon Moene <toon@moene.indiv.nluug.nl> 2002-08-31 Toon Moene <toon@moene.indiv.nluug.nl>
PR fortran/6367 PR fortran/6367

15
libf2c/libU77/datetime_.c
View File

@ -31,6 +31,11 @@ Boston, MA 02111-1307, USA. */
# include <time.h> # include <time.h>
# endif # endif
#endif #endif
#if defined (_WIN32)
#include <windows.h>
#undef min
#undef max
#endif
#include "f2c.h" #include "f2c.h"
void s_copy (register char *a, register char *b, ftnlen la, ftnlen lb); void s_copy (register char *a, register char *b, ftnlen la, ftnlen lb);
@ -44,6 +49,14 @@ G77_date_and_time_0 (char *date, char *fftime, char *zone,
struct tm ltime = *localtime (&lt), gtime = *gmtime (&lt); struct tm ltime = *localtime (&lt), gtime = *gmtime (&lt);
char dat[9], zon[6], ftim[11]; char dat[9], zon[6], ftim[11];
int i, vals[8]; int i, vals[8];
#if defined (_WIN32)
struct _SYSTEMTIME wdattim;
GetLocalTime(&wdattim);
vals[7] = wdattim.wMilliseconds;
#else
vals[7] = 0; /* no STDC/POSIX way to get this */
/* GNUish way; maybe use `ftime' on other systems. */
#endif
vals[0] = 1900 + ltime.tm_year; vals[0] = 1900 + ltime.tm_year;
vals[1] = 1 + ltime.tm_mon; vals[1] = 1 + ltime.tm_mon;
@ -55,8 +68,6 @@ G77_date_and_time_0 (char *date, char *fftime, char *zone,
vals[4] = ltime.tm_hour; vals[4] = ltime.tm_hour;
vals[5] = ltime.tm_min; vals[5] = ltime.tm_min;
vals[6] = ltime.tm_sec; vals[6] = ltime.tm_sec;
vals[7] = 0; /* no STDC/POSIX way to get this */
/* GNUish way; maybe use `ftime' on other systems. */
#if HAVE_GETTIMEOFDAY #if HAVE_GETTIMEOFDAY
{ {
struct timeval tp; struct timeval tp;