diff options
| author | George Hazan <ghazan@miranda.im> | 2019-01-28 15:51:04 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-01-28 15:51:04 +0300 |
| commit | ac6607c5f76566c2c840ca3955a22448738df9b3 (patch) | |
| tree | b697dbe07b88ac8fefb5f00a003c95710b3bbbeb /include | |
| parent | e787987f54733bd58f69ced43a506aa7fc42fb7c (diff) | |
mir_urlDecode & mir_urlEncode to return CMStringA
Diffstat (limited to 'include')
| -rw-r--r-- | include/delphi/m_core.inc | 8 | ||||
| -rw-r--r-- | include/m_core.h | 6 | ||||
| -rw-r--r-- | include/m_system_cpp.h | 10 |
3 files changed, 10 insertions, 14 deletions
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 @@ -151,12 +151,6 @@ 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
struct IconItem
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
|