summaryrefslogtreecommitdiff
path: root/include/m_core.h
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-07-04 15:20:21 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-07-04 15:20:21 +0000
commit947cf2858d18fc95f76c71622f58cc8957c26799 (patch)
treeb41255b2175d73c1e0719a01eaf1fe07d7da1d86 /include/m_core.h
parent419f192d3e4c52ace067722bcfd85904b7c2628b (diff)
mir_core:
- third parameter pBase added to PathToRelative/PathToRelativeW; - missing export 'db_mc_notifyDefChange' added to the .def file; - path utils moved to _tcsncpy_s function; - useless variables removed; - libraries regenerated; git-svn-id: http://svn.miranda-ng.org/main/trunk@9676 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'include/m_core.h')
-rw-r--r--include/m_core.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/include/m_core.h b/include/m_core.h
index 6bb86f68a6..6d4dfbbd55 100644
--- a/include/m_core.h
+++ b/include/m_core.h
@@ -588,20 +588,24 @@ MIR_CORE_DLL(HINSTANCE) GetInstByAddress(void* codePtr);
MIR_CORE_DLL(void) CreatePathToFile(char* wszFilePath);
MIR_CORE_DLL(int) CreateDirectoryTree(const char* szDir);
-MIR_CORE_DLL(int) PathToRelative(const char *pSrc, char *pOut);
MIR_CORE_DLL(int) PathIsAbsolute(const char *pSrc);
MIR_CORE_DLL(void) CreatePathToFileW(WCHAR* wszFilePath);
MIR_CORE_DLL(int) CreateDirectoryTreeW(const WCHAR* szDir);
-MIR_CORE_DLL(int) PathToRelativeW(const WCHAR *pSrc, WCHAR *pOut);
MIR_CORE_DLL(int) PathIsAbsoluteW(const WCHAR *pSrc);
#if defined( __cplusplus )
- MIR_CORE_DLL(int) PathToAbsolute(const char *pSrc, char *pOut, char* base=0);
- MIR_CORE_DLL(int) PathToAbsoluteW(const WCHAR *pSrc, WCHAR *pOut, WCHAR* base=0);
+ MIR_CORE_DLL(int) PathToAbsolute(const char *pSrc, char *pOut, const char* base=0);
+ MIR_CORE_DLL(int) PathToAbsoluteW(const WCHAR *pSrc, WCHAR *pOut, const WCHAR* base = 0);
+
+ MIR_CORE_DLL(int) PathToRelative(const char *pSrc, char *pOut, const char* base = 0);
+ MIR_CORE_DLL(int) PathToRelativeW(const WCHAR *pSrc, WCHAR *pOut, const WCHAR* base = 0);
#else
- MIR_CORE_DLL(int) PathToAbsolute(const char *pSrc, char *pOut, char* base);
- MIR_CORE_DLL(int) PathToAbsoluteW(const WCHAR *pSrc, WCHAR *pOut, WCHAR* base);
+ MIR_CORE_DLL(int) PathToAbsolute(const char *pSrc, char *pOut, const char* base);
+ MIR_CORE_DLL(int) PathToAbsoluteW(const WCHAR *pSrc, WCHAR *pOut, const WCHAR* base);
+
+ MIR_CORE_DLL(int) PathToRelative(const char *pSrc, char *pOut, const char* base);
+ MIR_CORE_DLL(int) PathToRelativeW(const WCHAR *pSrc, WCHAR *pOut, const WCHAR* base);
#endif
#define CreatePathToFileT CreatePathToFileW