From cc415305a049ca523f2a8cf674009fa77c54fee6 Mon Sep 17 00:00:00 2001 From: cvs2svn Date: Sat, 14 Nov 2009 12:33:33 +0000 Subject: This commit was manufactured by cvs2svn to create tag 'RELEASE_8_0_0'. --- .../files/patch-lib_stdlib_src_calendar.erl | 29 ---------------------- 1 file changed, 29 deletions(-) delete mode 100644 lang/erlang14/files/patch-lib_stdlib_src_calendar.erl (limited to 'lang/erlang14/files/patch-lib_stdlib_src_calendar.erl') diff --git a/lang/erlang14/files/patch-lib_stdlib_src_calendar.erl b/lang/erlang14/files/patch-lib_stdlib_src_calendar.erl deleted file mode 100644 index 1ab956512316..000000000000 --- a/lang/erlang14/files/patch-lib_stdlib_src_calendar.erl +++ /dev/null @@ -1,29 +0,0 @@ - -$FreeBSD$ - ---- lib/stdlib/src/calendar.erl.orig -+++ lib/stdlib/src/calendar.erl -@@ -215,11 +215,19 @@ - - -spec local_time_to_universal_time_dst(t_datetime1970()) -> [t_datetime1970()]. - local_time_to_universal_time_dst(DateTime) -> -- UtDst = erlang:localtime_to_universaltime(DateTime, true), -- Ut = erlang:localtime_to_universaltime(DateTime, false), - %% Reverse check the universal times -- LtDst = erlang:universaltime_to_localtime(UtDst), -- Lt = erlang:universaltime_to_localtime(Ut), -+ {UtDst, LtDst} = -+ try -+ UtDst0 = erlang:localtime_to_universaltime(DateTime, true), -+ {UtDst0, erlang:universaltime_to_localtime(UtDst0)} -+ catch error:badarg -> {error, error} -+ end, -+ {Ut, Lt} = -+ try -+ Ut0 = erlang:localtime_to_universaltime(DateTime, false), -+ {Ut0, erlang:universaltime_to_localtime(Ut0)} -+ catch error:badarg -> {error, error} -+ end, - %% Return the valid universal times - case {LtDst,Lt} of - {DateTime,DateTime} when UtDst =/= Ut -> -- cgit v1.2.3