summaryrefslogtreecommitdiff
path: root/src/environment.cpp
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/environment.cpp
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/environment.cpp')
-rw-r--r--src/environment.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/environment.cpp b/src/environment.cpp
index 59159868e..88f25536f 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -70,7 +70,7 @@ Environment::~Environment()
void Environment::addPlayer(Player *player)
{
- DSTACK(__FUNCTION_NAME);
+ DSTACK(FUNCTION_NAME);
/*
Check that peer_ids are unique.
Also check that names are unique.
@@ -982,7 +982,7 @@ void ServerEnvironment::clearAllObjects()
void ServerEnvironment::step(float dtime)
{
- DSTACK(__FUNCTION_NAME);
+ DSTACK(FUNCTION_NAME);
//TimeTaker timer("ServerEnv step");
@@ -2028,7 +2028,7 @@ ClientMap & ClientEnvironment::getClientMap()
void ClientEnvironment::addPlayer(Player *player)
{
- DSTACK(__FUNCTION_NAME);
+ DSTACK(FUNCTION_NAME);
/*
It is a failure if player is local and there already is a local
player
@@ -2052,7 +2052,7 @@ LocalPlayer * ClientEnvironment::getLocalPlayer()
void ClientEnvironment::step(float dtime)
{
- DSTACK(__FUNCTION_NAME);
+ DSTACK(FUNCTION_NAME);
/* Step time of day */
stepTimeOfDay(dtime);