aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src
diff options
context:
space:
mode:
authorGustav Simonsson <[email protected]>2012-07-10 10:39:15 +0200
committerGustav Simonsson <[email protected]>2012-07-10 10:39:15 +0200
commit633c937ff52687a55c84ad0d158205112376d6f9 (patch)
tree6def71d716c202f08fcbd23e83190ce76055c125 /lib/stdlib/src
parent3c972cc1a1686f85464b8da3702718c6a52093ea (diff)
parenteac9c3494ce4d684b09779f075317e8943a7928b (diff)
downloadotp-633c937ff52687a55c84ad0d158205112376d6f9.tar.gz
otp-633c937ff52687a55c84ad0d158205112376d6f9.tar.bz2
otp-633c937ff52687a55c84ad0d158205112376d6f9.zip
Merge branch 'maint'
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r--lib/stdlib/src/gen_server.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl
index 59c6d240ba..04308a51b7 100644
--- a/lib/stdlib/src/gen_server.erl
+++ b/lib/stdlib/src/gen_server.erl
@@ -270,7 +270,7 @@ enter_loop(Mod, Options, State) ->
enter_loop(Mod, Options, State, self(), infinity).
enter_loop(Mod, Options, State, ServerName = {Scope, _})
- when Scope == local; Scope == local ->
+ when Scope == local; Scope == global ->
enter_loop(Mod, Options, State, ServerName, infinity);
enter_loop(Mod, Options, State, ServerName = {via, _, _}) ->