From 2b7c50a79e27cc49a94df298176c67a0b602dc57 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 23 Apr 2013 09:10:00 +0000 Subject: also wrtrim renamed, according to the standard, to rtrimw git-svn-id: http://svn.miranda-ng.org/main/trunk@4516 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/delphi/m_core.inc | 4 ++-- include/m_core.h | 14 +++++--------- 2 files changed, 7 insertions(+), 11 deletions(-) (limited to 'include') diff --git a/include/delphi/m_core.inc b/include/delphi/m_core.inc index 5c550e109c..e462aeac27 100644 --- a/include/delphi/m_core.inc +++ b/include/delphi/m_core.inc @@ -555,8 +555,8 @@ procedure mir_sha1_hash(dataIn:pmir_sha1_byte_t; len:int;hashout:SHA1Hash); stdc function rtrim(str:pAnsiChar):pAnsiChar; stdcall; external CoreDLL name 'rtrim'; -function wrtrim(str:pWideChar):pWideChar; stdcall; - external CoreDLL name 'wrtrim'; +function rtrimw(str:pWideChar):pWideChar; stdcall; + external CoreDLL name 'rtrimw'; // returns pointer to the beginning of string function ltrim(str:pAnsiChar):pAnsiChar; stdcall; diff --git a/include/m_core.h b/include/m_core.h index 0b4fdf7ca6..e44ebee070 100644 --- a/include/m_core.h +++ b/include/m_core.h @@ -454,18 +454,12 @@ MIR_CORE_DLL(void) mir_sha1_hash(mir_sha1_byte_t *dataIn, int len, mir_sha1_byte // strings MIR_CORE_DLL(char*) rtrim(char *str); -MIR_CORE_DLL(WCHAR*) wrtrim(WCHAR *str); +MIR_CORE_DLL(WCHAR*) rtrimw(WCHAR *str); -#ifdef _UNICODE - #define trtrim wrtrim -#else - #define trtrim rtrim -#endif - -MIR_CORE_DLL(char*) ltrim(char *str); // returns pointer to the beginning of string +MIR_CORE_DLL(char*) ltrim(char *str); // returns pointer to the beginning of string MIR_CORE_DLL(WCHAR*) ltrimw(WCHAR *str); -MIR_CORE_DLL(char*) ltrimp(char *str); // returns pointer to the trimmed portion of string +MIR_CORE_DLL(char*) ltrimp(char *str); // returns pointer to the trimmed portion of string MIR_CORE_DLL(WCHAR*) ltrimpw(WCHAR *str); MIR_CORE_DLL(int) wildcmp(const char *name, const char *mask); @@ -503,6 +497,7 @@ __forceinline char* lrtrimp(char *str) { return ltrimp(rtrim(str)); }; #define mir_tstrndup mir_wstrndup #define replaceStrT replaceStrW + #define rtrimt rtrimw #define ltrimt ltrimw #define ltrimpt ltrimpw @@ -523,6 +518,7 @@ __forceinline char* lrtrimp(char *str) { return ltrimp(rtrim(str)); }; #define mir_tstrndup mir_strndup #define replaceStrT replaceStr + #define rtrimt rtrim #define ltrimt ltrim #define ltrimpt ltrimp -- cgit v1.2.3