3 files changed, 2 insertions, 40 deletions
diff --git a/plugins/CmdLine/MimCmd/src/MimCmd.cpp b/plugins/CmdLine/MimCmd/src/MimCmd.cpp
index 94f614a20c..8ae4e6909d 100644
--- a/plugins/CmdLine/MimCmd/src/MimCmd.cpp
+++ b/plugins/CmdLine/MimCmd/src/MimCmd.cpp
@@ -28,7 +28,7 @@ int lpprintf(const char *format, ...)
 	va_start(va, format);
 	const int MAX_SIZE = 16192;
 	char buffer[MAX_SIZE] = {0};
-	int len = _vsnprintf(buffer, MAX_SIZE - 1, format, va);
+	int len = mir_vsnprintf(buffer, MAX_SIZE - 1, format, va);
 	buffer[MAX_SIZE - 1] = 0;
 	va_end(va);
 	CharToOemBuff(buffer, buffer, len);
diff --git a/plugins/CmdLine/MimCmd/src/commands.cpp b/plugins/CmdLine/MimCmd/src/commands.cpp
index bae47b089c..8b2f70259f 100644
--- a/plugins/CmdLine/MimCmd/src/commands.cpp
+++ b/plugins/CmdLine/MimCmd/src/commands.cpp
@@ -131,7 +131,7 @@ void HandleHelpCommand(PCommand helpCommand, char *argv[], int argc, PReply repl
 		}
 		else{
 			reply->code = MIMRES_NOTFOUND;
-			_snprintf(reply->message, size, Translate("No help for '%s'."), argv[2]);
+			mir_snprintf(reply->message, size, Translate("No help for '%s'."), argv[2]);
 			reply->message[size -1 ] = 0;
 		}
 	}
diff --git a/plugins/CmdLine/src/commonheaders.h b/plugins/CmdLine/src/commonheaders.h
index 9cd110bc24..eb64fbed2a 100644
--- a/plugins/CmdLine/src/commonheaders.h
+++ b/plugins/CmdLine/src/commonheaders.h
@@ -59,42 +59,4 @@ extern int bWaitForUnload;
 
 #define ID_ICQ_EXIT		40001
 
-static __inline int mir_old_snprintf(char *buffer, size_t count, const char* fmt, ...) {
-	va_list va;
-	int len;
-
-	va_start(va, fmt);
-	len = _vsnprintf(buffer, count-1, fmt, va);
-	va_end(va);
-	buffer[count-1] = 0;
-	return len;
-}
-
-static __inline int mir_old_sntprintf(TCHAR *buffer, size_t count, const TCHAR* fmt, ...) {
-	va_list va;
-	int len;
-
-	va_start(va, fmt);
-	len = _vsntprintf(buffer, count-1, fmt, va);
-	va_end(va);
-	buffer[count-1] = 0;
-	return len;
-}
-
-static __inline int mir_old_vsnprintf(char *buffer, size_t count, const char* fmt, va_list va) {
-	int len;
-
-	len = _vsnprintf(buffer, count-1, fmt, va);
-	buffer[count-1] = 0;
-	return len;
-}
-
-static __inline int mir_old_vsntprintf(TCHAR *buffer, size_t count, const TCHAR* fmt, va_list va) {
-	int len;
-
-	len = _vsntprintf(buffer, count-1, fmt, va);
-	buffer[count-1] = 0;
-	return len;
-}
-
 #endif //M_CMDLINE_COMMONHEADERS_H
 \ No newline at end of file