summaryrefslogtreecommitdiff
path: root/erts/emulator/sys/win32/erl_win_sys.h
diff options
context:
space:
mode:
authorErlang/OTP <otp@erlang.org>2022-05-02 12:26:29 +0200
committerErlang/OTP <otp@erlang.org>2022-05-02 12:26:29 +0200
commit323ad150c0a4886e8c20d6b0a0215c3e7f9dd353 (patch)
treeca81c0d65b3b8e216175fe02c3108b1039fe9c0f /erts/emulator/sys/win32/erl_win_sys.h
parent9977fd1c306c8dc840a4b57f4ac73eac0ff82e27 (diff)
parent5ee1d5909e9b0ce02dc5334f7f03f3ec3c7565f3 (diff)
downloaderlang-323ad150c0a4886e8c20d6b0a0215c3e7f9dd353.tar.gz
Merge branch 'lukas/22/erts/fix-localtime-tz-change/OTP-18076' into maint-24
* 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.h2
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