diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-02 15:55:48 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-02 15:55:48 +0000 |
| commit | ab53b72bf7067feb9dede0fd76b5a3cbc13863b9 (patch) | |
| tree | 677a18bc997d1cf118379b288a7c2dd2c160d9b1 /include/m_string.h | |
| parent | 1c229f90bfc6c8032bd2d20e297e97f321eb4db7 (diff) | |
- old PNG conversion code (png2dib, dib2png) removed;
- m_png.h also removed;
- all calls of LoadImage replaced with CallService(MS_IMG_LOAD);
- four invalid CloseHandle() calls removed;
- massive code cleaning for Popup, HistoryStats & SplashScreen plugins
git-svn-id: http://svn.miranda-ng.org/main/trunk@13974 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'include/m_string.h')
| -rw-r--r-- | include/m_string.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/m_string.h b/include/m_string.h index 82e279f31f..ae769e52bc 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -607,18 +607,21 @@ public: return _vscwprintf(pszFormat, args);
}
-#pragma warning(push)
-#pragma warning(disable : 4995 4996)
static int __stdcall Format(LPWSTR pszBuffer, LPCWSTR pszFormat, va_list args)
{
+ #pragma warning(push)
+ #pragma warning(disable : 4996)
return vswprintf(pszBuffer, pszFormat, args);
+ #pragma warning(pop)
}
static int __stdcall Format(LPWSTR pszBuffer, size_t nLength, LPCWSTR pszFormat, va_list args)
{
+ #pragma warning(push)
+ #pragma warning(disable : 4996)
return _vsnwprintf(pszBuffer, nLength, pszFormat, args);
+ #pragma warning(pop)
}
-#pragma warning(pop)
static int __stdcall GetBaseTypeLength(LPCSTR pszSrc)
{
|