summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--lib/tolua++/Makefile3
-rw-r--r--src/OSSupport/Queue.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/tolua++/Makefile b/lib/tolua++/Makefile
index c15b4fc80..3bbda9b15 100644
--- a/lib/tolua++/Makefile
+++ b/lib/tolua++/Makefile
@@ -35,6 +35,9 @@ CMAKE_COMMAND = /usr/bin/cmake
# The command to remove a file.
RM = /usr/bin/cmake -E remove -f
+# Escaping for special characters.
+EQUALS = =
+
# The top-level source directory on which CMake was run.
CMAKE_SOURCE_DIR = /home/tycho/MCServer
diff --git a/src/OSSupport/Queue.h b/src/OSSupport/Queue.h
index fc942b3e1..ab42c871e 100644
--- a/src/OSSupport/Queue.h
+++ b/src/OSSupport/Queue.h
@@ -131,7 +131,7 @@ public:
}
// Removes an Item from the queue
- bool Remove(ItemType item)
+ bool Remove(ItemType a_item)
{
cCSLock Lock(m_CS);
for (iterator itr = m_contents.begin(); itr != m_contents.end(); ++itr)