diff options
| author | Eric Christopher <echristo@redhat.com> | 2002-09-24 23:43:14 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@redhat.com> | 2002-09-24 23:43:14 +0000 |
| commit | df77e926319f02ef7c5eab470418a07451880584 (patch) | |
| tree | 420c152503f7f870e49325f08fcece8968f524f4 /libf2c | |
| parent | 0c1197505c815e94cbe111f3843200eb009f4ef7 (diff) | |
Merge from gcc-3_4-basic-improvements-branch.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/mips-3_4-rewrite-branch@57486 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libf2c')
| -rw-r--r-- | libf2c/ChangeLog | 5 | ||||
| -rw-r--r-- | libf2c/libF77/Version.c | 2 | ||||
| -rw-r--r-- | libf2c/libI77/Version.c | 2 | ||||
| -rw-r--r-- | libf2c/libU77/Version.c | 2 | ||||
| -rw-r--r-- | libf2c/libU77/datetime_.c | 15 |
5 files changed, 21 insertions, 5 deletions
diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog index 6627427edec..87ce8282369 100644 --- a/libf2c/ChangeLog +++ b/libf2c/ChangeLog @@ -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> PR fortran/6367 diff --git a/libf2c/libF77/Version.c b/libf2c/libF77/Version.c index e0102378df4..a013f15c385 100644 --- a/libf2c/libF77/Version.c +++ b/libf2c/libF77/Version.c @@ -3,7 +3,7 @@ static char junk[] = "\n@(#)LIBF77 VERSION 20000929\n"; /* */ -char __G77_LIBF77_VERSION__[] = "3.3 20020913 (experimental)"; +char __G77_LIBF77_VERSION__[] = "3.4-bi 20020919 (experimental)"; /* 2.00 11 June 1980. File version.c added to library. diff --git a/libf2c/libI77/Version.c b/libf2c/libI77/Version.c index 268ba6af2c1..41dd012fc2c 100644 --- a/libf2c/libI77/Version.c +++ b/libf2c/libI77/Version.c @@ -3,7 +3,7 @@ static char junk[] = "\n@(#) LIBI77 VERSION pjw,dmg-mods 20001205\n"; /* */ -char __G77_LIBI77_VERSION__[] = "3.3 20020913 (experimental)"; +char __G77_LIBI77_VERSION__[] = "3.4-bi 20020919 (experimental)"; /* 2.01 $ format added diff --git a/libf2c/libU77/Version.c b/libf2c/libU77/Version.c index 29356ed4278..16f6e8590bc 100644 --- a/libf2c/libU77/Version.c +++ b/libf2c/libU77/Version.c @@ -1,6 +1,6 @@ static char junk[] = "\n@(#) LIBU77 VERSION 19980709\n"; -char __G77_LIBU77_VERSION__[] = "3.3 20020913 (experimental)"; +char __G77_LIBU77_VERSION__[] = "3.4-bi 20020919 (experimental)"; #include <stdio.h> diff --git a/libf2c/libU77/datetime_.c b/libf2c/libU77/datetime_.c index 40786ed8e6d..cd7c7ca0a3b 100644 --- a/libf2c/libU77/datetime_.c +++ b/libf2c/libU77/datetime_.c @@ -31,6 +31,11 @@ Boston, MA 02111-1307, USA. */ # include <time.h> # endif #endif +#if defined (_WIN32) +#include <windows.h> +#undef min +#undef max +#endif #include "f2c.h" 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 (<), gtime = *gmtime (<); char dat[9], zon[6], ftim[11]; 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[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[5] = ltime.tm_min; 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 { struct timeval tp; |