aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-09-25 17:21:00 +0200
committerKim Alvefur <zash@zash.se>2015-09-25 17:21:00 +0200
commitede3ce082af110d62ef98187e8144473f6fac9b5 (patch)
tree67be9f5cb86c436ace60a6b6273d803e6b52fcaf
parent988a7cc8cbb03db01d9cdd42514e08e6ef41f769 (diff)
downloadprosody-ede3ce082af110d62ef98187e8144473f6fac9b5.tar.gz
prosody-ede3ce082af110d62ef98187e8144473f6fac9b5.zip
server_event: Rename luaevent module variable to avoid name clash [luacheck]
-rw-r--r--net/server_event.lua14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/server_event.lua b/net/server_event.lua
index 934501ab..3cfa76f6 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -48,7 +48,7 @@ local coroutine_yield = coroutine.yield
local has_luasec, ssl = pcall ( require , "ssl" )
local socket = require "socket"
-local event = require "luaevent.core"
+local levent = require "luaevent.core"
local socket_gettime = socket.gettime
local getaddrinfo = socket.dns.getaddrinfo
@@ -78,12 +78,12 @@ local bitor = ( function( ) -- thx Rici Lake
end
end )( )
-local base = event.new( )
+local base = levent.new( )
local addevent = base.addevent
-local EV_READ = event.EV_READ
-local EV_WRITE = event.EV_WRITE
-local EV_TIMEOUT = event.EV_TIMEOUT
-local EV_SIGNAL = event.EV_SIGNAL
+local EV_READ = levent.EV_READ
+local EV_WRITE = levent.EV_WRITE
+local EV_TIMEOUT = levent.EV_TIMEOUT
+local EV_SIGNAL = levent.EV_SIGNAL
local EV_READWRITE = bitor( EV_READ, EV_WRITE )
@@ -803,7 +803,7 @@ return {
base = base,
loop = loop,
link = link,
- event = event,
+ event = levent,
event_base = base,
addevent = newevent,
addserver = addserver,