Merge branch 'master' into win32-x64-working

This commit is contained in:
nhmall
2015-04-17 06:34:48 -04:00
6 changed files with 7 additions and 7 deletions

View File

@@ -567,7 +567,7 @@ unsigned int *stuckid, *steedid;
foo = time_from_yyyymmddhhmmss(timebuf);
ReadTimebuf(ubirthday);
ReadTimebuf(urealtime.realtime);
mread(fd, &urealtime.realtime, sizeof(urealtime.realtime));
ReadTimebuf(urealtime.restored);
#if defined(BSD) && !defined(POSIX_TYPES)
(void) time((long *)&urealtime.restored);