From edd9607b3bea79be718b774b8c58e623b918eee2 Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Fri, 15 Jul 2016 16:18:06 +0200
Subject: Fix type and template errors from bugs.erlang.org: ERL-172 and
 ERL-187

---
 lib/stdlib/src/gen_statem.erl | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'lib/stdlib/src/gen_statem.erl')

diff --git a/lib/stdlib/src/gen_statem.erl b/lib/stdlib/src/gen_statem.erl
index 23bddafeed..c02e6a1a19 100644
--- a/lib/stdlib/src/gen_statem.erl
+++ b/lib/stdlib/src/gen_statem.erl
@@ -219,9 +219,10 @@
 	    OldState :: state(),
 	    OldData :: data(),
 	    Extra :: term()) ->
-    {NewCallbackMode :: callback_mode(),
+    {CallbackMode :: callback_mode(),
      NewState :: state(),
-     NewData :: data()}.
+     NewData :: data()} |
+    (Reason :: term()).
 
 %% Format the callback module state in some sensible that is
 %% often condensed way.  For StatusOption =:= 'normal' the perferred
@@ -630,11 +631,11 @@ system_code_change(
 	    Result -> Result
 	end
     of
-	{NewCallbackMode,NewState,NewData} ->
-	    callback_mode(NewCallbackMode) orelse
-		error({callback_mode,NewCallbackMode}),
+	{CallbackMode,NewState,NewData} ->
+	    callback_mode(CallbackMode) orelse
+		error({callback_mode,CallbackMode}),
 	    {ok,
-	     S#{callback_mode := NewCallbackMode,
+	     S#{callback_mode := CallbackMode,
 		state := NewState,
 		data := NewData}};
 	{ok,_} = Error ->
-- 
cgit v1.2.3