summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2009-11-03 22:45:50 +0000
committerdanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2009-11-03 22:45:50 +0000
commit9566b0bb159d994506094f011b5dcf73fc1c38a3 (patch)
tree4a960d66a7551135aaad38845b7f8a645fefc7bb
parentab4b307b744f3602512fd2ab126c5f4f4a2173db (diff)
Match USERINPUT/USEROUTPUT identifiers
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12004 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--include/inspircd.h1
-rw-r--r--[-rwxr-xr-x]src/modules/m_nationalchars.cpp0
-rw-r--r--src/users.cpp2
3 files changed, 1 insertions, 2 deletions
diff --git a/include/inspircd.h b/include/inspircd.h
index 2b6fc579a..0bbf3fb03 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -26,7 +26,6 @@
#else
#include "inspircd_win32wrapper.h"
/** Windows defines these already */
-#undef DELETE
#undef ERROR
#endif
diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp
index e8a70d148..e8a70d148 100755..100644
--- a/src/modules/m_nationalchars.cpp
+++ b/src/modules/m_nationalchars.cpp
diff --git a/src/users.cpp b/src/users.cpp
index c2cda4aea..14edf649f 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -1012,7 +1012,7 @@ void LocalUser::Write(const std::string& text)
return;
}
- ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"C[%d] O %s", this->GetFd(), text.c_str());
+ ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"C[%s] O %s", uuid.c_str(), text.c_str());
this->AddWriteBuf(text);
this->AddWriteBuf(wide_newline);