aboutsummaryrefslogtreecommitdiff
path: root/src/script/lua_api
diff options
context:
space:
mode:
authorShadowNinja <shadowninja@minetest.net>2015-10-14 02:39:30 -0400
committerkwolekr <kwolekr@minetest.net>2015-10-14 02:39:37 -0400
commit6f2d785d0ff761961912d7e79a7d16c4adf86861 (patch)
tree3b96b197cc58b3a4bd30663cb66cf2aca630e77d /src/script/lua_api
parent6f4d6cb5741d10e10dacc78e264e421bf6a297cf (diff)
downloadminetest-6f2d785d0ff761961912d7e79a7d16c4adf86861.tar.gz
minetest-6f2d785d0ff761961912d7e79a7d16c4adf86861.tar.bz2
minetest-6f2d785d0ff761961912d7e79a7d16c4adf86861.zip
Rename macros with two leading underscores
These names are reserved for the compiler/library implementations.
Diffstat (limited to 'src/script/lua_api')
-rw-r--r--src/script/lua_api/l_server.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/script/lua_api/l_server.cpp b/src/script/lua_api/l_server.cpp
index a6dac487b..6a8183088 100644
--- a/src/script/lua_api/l_server.cpp
+++ b/src/script/lua_api/l_server.cpp
@@ -110,7 +110,7 @@ int ModApiServer::l_get_player_ip(lua_State *L)
}
catch(con::PeerNotFoundException) // unlikely
{
- dstream << __FUNCTION_NAME << ": peer was not found" << std::endl;
+ dstream << FUNCTION_NAME << ": peer was not found" << std::endl;
lua_pushnil(L); // error
return 1;
}
@@ -136,7 +136,7 @@ int ModApiServer::l_get_player_information(lua_State *L)
}
catch(con::PeerNotFoundException) // unlikely
{
- dstream << __FUNCTION_NAME << ": peer was not found" << std::endl;
+ dstream << FUNCTION_NAME << ": peer was not found" << std::endl;
lua_pushnil(L); // error
return 1;
}
@@ -150,7 +150,7 @@ int ModApiServer::l_get_player_information(lua_State *L)
#define ERET(code) \
if (!(code)) { \
- dstream << __FUNCTION_NAME << ": peer was not found" << std::endl; \
+ dstream << FUNCTION_NAME << ": peer was not found" << std::endl; \
lua_pushnil(L); /* error */ \
return 1; \
}
@@ -281,7 +281,7 @@ int ModApiServer::l_ban_player(lua_State *L)
}
catch(con::PeerNotFoundException) // unlikely
{
- dstream << __FUNCTION_NAME << ": peer was not found" << std::endl;
+ dstream << FUNCTION_NAME << ": peer was not found" << std::endl;
lua_pushboolean(L, false); // error
return 1;
}