diff options
| author | Lukas Larsson <lukas@erlang.org> | 2022-05-02 08:32:54 +0200 |
|---|---|---|
| committer | Lukas Larsson <lukas@erlang.org> | 2022-05-02 08:32:54 +0200 |
| commit | 56e75b1a1f07feee4786db38d4f034ca03d96f61 (patch) | |
| tree | f48bbaf7396df384c2b7b0dcc8142aad5f9fdff8 /erts/emulator/sys/win32/erl_win_sys.h | |
| parent | 9c4a05adc929e4f3a4263552ef17069df263aae7 (diff) | |
| parent | 5ee1d5909e9b0ce02dc5334f7f03f3ec3c7565f3 (diff) | |
| download | erlang-56e75b1a1f07feee4786db38d4f034ca03d96f61.tar.gz | |
Merge branch 'lukas/22/erts/fix-localtime-tz-change/OTP-18076' into maint
* lukas/22/erts/fix-localtime-tz-change/OTP-18076:
erts: Fix localtime_r summer/winter-time change bug
Diffstat (limited to 'erts/emulator/sys/win32/erl_win_sys.h')
| -rw-r--r-- | erts/emulator/sys/win32/erl_win_sys.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/erts/emulator/sys/win32/erl_win_sys.h b/erts/emulator/sys/win32/erl_win_sys.h index 61df76f6c1..e6a7b1233e 100644 --- a/erts/emulator/sys/win32/erl_win_sys.h +++ b/erts/emulator/sys/win32/erl_win_sys.h @@ -135,8 +135,6 @@ 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 |