From ac6607c5f76566c2c840ca3955a22448738df9b3 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 28 Jan 2019 15:51:04 +0300
Subject: mir_urlDecode & mir_urlEncode to return CMStringA

---
 include/delphi/m_core.inc |  8 --------
 include/m_core.h          |  6 ------
 include/m_system_cpp.h    | 10 ++++++++++
 3 files changed, 10 insertions(+), 14 deletions(-)

(limited to 'include')

diff --git a/include/delphi/m_core.inc b/include/delphi/m_core.inc
index 33ff1fdfb8..479644b896 100644
--- a/include/delphi/m_core.inc
+++ b/include/delphi/m_core.inc
@@ -144,14 +144,6 @@ procedure KillObjectServices(var ptr); stdcall;
 function CallProtoService(const szModule:PAnsiChar;const szService:PAnsiChar;wParam:WPARAM;lParam:LPARAM):int_ptr; stdcall;
                  external AppDLL name 'CallProtoService';
 
-
-///////////////////////////////////////////////////////////////////////////////
-// http
-
-// returned result must be freed using mir_free()
-function mir_urlEncode(url:PAnsiChar): PAnsiChar; stdcall;
-                 external CoreDLL name 'mir_urlEncode';
-
 ///////////////////////////////////////////////////////////////////////////////
 // wait handles
 
diff --git a/include/m_core.h b/include/m_core.h
index 44152a2733..a13d9fc118 100644
--- a/include/m_core.h
+++ b/include/m_core.h
@@ -150,12 +150,6 @@ typedef DWORD (__cdecl *pfnExceptionFilter)(DWORD code, EXCEPTION_POINTERS* info
 MIR_CORE_DLL(pfnExceptionFilter) GetExceptionFilter(void);
 MIR_CORE_DLL(pfnExceptionFilter) SetExceptionFilter(pfnExceptionFilter pMirandaExceptFilter);
 
-///////////////////////////////////////////////////////////////////////////////
-// http support
-
-MIR_CORE_DLL(char*) mir_urlDecode(const char *szUrl);
-MIR_CORE_DLL(char*) mir_urlEncode(const char *szUrl);
-
 ///////////////////////////////////////////////////////////////////////////////
 // icons support
 
diff --git a/include/m_system_cpp.h b/include/m_system_cpp.h
index 667aa5f1c8..78df1577f5 100644
--- a/include/m_system_cpp.h
+++ b/include/m_system_cpp.h
@@ -30,6 +30,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	#include "m_system.h"
 #endif
 
+#ifndef M_STRING_H__
+	#include <m_string.h>
+#endif
+
 #if defined(__cplusplus)
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -424,6 +428,12 @@ struct WCHAR_PARAM : public PARAM
 	{}
 };
 
+///////////////////////////////////////////////////////////////////////////////
+// http support
+
+MIR_CORE_DLL(CMStringA) mir_urlDecode(const char *szUrl);
+MIR_CORE_DLL(CMStringA) mir_urlEncode(const char *szUrl);
+
 #endif
 
 #endif // M_SYSTEM_CPP_H
-- 
cgit v1.2.3