Merge branch 'egil/file-info-opt-utc/OTP-7687'

* egil/file-info-opt-utc/OTP-7687: (39 commits)
  Remove time_t specific test in prim_file_SUITE
  Update prim_file.beam and prim_zip.beam
  Add types for posixtime_to_universaltime and the reverse
  Set BASEYEAR to 1902
  Set lower limit of years handled to 1601
  Emulate localtime, gmtime and mktime to enable negative time_t
  Document file:*_file_info/2
  Fix compiler warning in unix_efile.c
  Change name of bif universaltime_to_seconds/1
  Change options to prim_file:*_file_info/*
  Remove dead code
  Catch errors from prim_file:*_file_info
  Testcase for utc <-> seconds conversion
  Fix negative time in seconds_to_universaltime/1
  Remove OS taint from datetime conversion
  Add utc <-> seconds conversions bifs
  Let prim_file validate ctime in file_info
  Teach #file_info spec unix epochs for file times
  Add file_info_opt tests in prim_file_SUITE
  unix_efile: Zero is a valid number in utime
  ...

Conflicts:
	erts/emulator/beam/erl_time_sup.c
	erts/emulator/sys/win32/erl_win_sys.h
	erts/emulator/sys/win32/sys_time.c

1 files changed, 10 insertions, 0 deletions

diff --git a/erts/emulator/sys/win32/erl_win_sys.h b/erts/emulator/sys/win32/erl_win_sys.h
index cf3fb4446f..e8453205ea 100644
--- a/erts/emulator/sys/win32/erl_win_sys.h
+++ b/erts/emulator/sys/win32/erl_win_sys.h
@@ -128,6 +128,16 @@ int erts_check_io_debug(void);
  */
 typedef __int64 erts_time_t;
 
+struct tm *sys_localtime_r(time_t *epochs, struct tm *ptm);
+struct tm *sys_gmtime_r(time_t *epochs, struct tm *ptm);
+time_t sys_mktime( struct tm *ptm);
+
+#define localtime_r sys_localtime_r
+#define HAVE_LOCALTIME_R 1
+#define gmtime_r sys_gmtime_r
+#define HAVE_GMTIME_R
+#define mktime sys_mktime
+
 typedef struct {
     erts_time_t tv_sec;
     erts_time_t tv_usec;