From 93e2edb9fea7609ffd1d5b0aa90dc13256c0185a Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Wed, 17 Dec 2014 19:58:56 +0000 Subject: removed not needed file git-svn-id: http://svn.miranda-ng.org/main/trunk@11490 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Utils/mir_buffer.h | 1 - plugins/Utils/mir_dblists.cpp | 1 - plugins/Utils/mir_memory.h | 59 ------------------------------------------- plugins/Utils/mir_options.cpp | 1 - plugins/Utils/mir_smileys.cpp | 1 - 5 files changed, 63 deletions(-) delete mode 100644 plugins/Utils/mir_memory.h (limited to 'plugins/Utils') diff --git a/plugins/Utils/mir_buffer.h b/plugins/Utils/mir_buffer.h index 6dc35c0a88..a972c9f6c4 100644 --- a/plugins/Utils/mir_buffer.h +++ b/plugins/Utils/mir_buffer.h @@ -23,7 +23,6 @@ Boston, MA 02111-1307, USA. #include -#include "mir_memory.h" #include template diff --git a/plugins/Utils/mir_dblists.cpp b/plugins/Utils/mir_dblists.cpp index 1c4df07696..83917d0c7c 100644 --- a/plugins/Utils/mir_dblists.cpp +++ b/plugins/Utils/mir_dblists.cpp @@ -19,7 +19,6 @@ Boston, MA 02111-1307, USA. #include "mir_dblists.h" -#include "mir_memory.h" #include diff --git a/plugins/Utils/mir_memory.h b/plugins/Utils/mir_memory.h deleted file mode 100644 index 56ee80d2ac..0000000000 --- a/plugins/Utils/mir_memory.h +++ /dev/null @@ -1,59 +0,0 @@ -/* -Copyright (C) 2005-2009 Ricardo Pescuma Domenecci - -This is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -This is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with this file; see the file license.txt. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. -*/ - -#ifndef __MIR_MEMORY_H__ -# define __MIR_MEMORY_H__ - -#include - -static int strcmpnull(char *str1, char *str2) -{ - if ( str1 == NULL && str2 == NULL ) - return 0; - if ( str1 != NULL && str2 == NULL ) - return 1; - if ( str1 == NULL && str2 != NULL ) - return -1; - - return strcmp(str1, str2); -} - -static int strcmpnullW(WCHAR *str1, WCHAR *str2) -{ - if ( str1 == NULL && str2 == NULL ) - return 0; - if ( str1 != NULL && str2 == NULL ) - return 1; - if ( str1 == NULL && str2 != NULL ) - return -1; - - return lstrcmpW(str1, str2); -} - -# define lstrcmpnull strcmpnullW - -#define INPLACE_CHAR_TO_TCHAR(_new_var_, _size_, _old_var_) \ - TCHAR _new_var_[_size_]; \ - MultiByteToWideChar(CP_ACP, 0, _old_var_, -1, _new_var_, _size_) - -#define INPLACE_TCHAR_TO_CHAR(_new_var_, _size_, _old_var_) \ - char _new_var_[_size_]; \ - WideCharToMultiByte(CP_ACP, 0, _old_var_, -1, _new_var_, _size_, NULL, NULL); - -#endif // __MIR_MEMORY_H__ diff --git a/plugins/Utils/mir_options.cpp b/plugins/Utils/mir_options.cpp index ea8844b93b..5f0d6748cc 100644 --- a/plugins/Utils/mir_options.cpp +++ b/plugins/Utils/mir_options.cpp @@ -31,7 +31,6 @@ Boston, MA 02111-1307, USA. #include #include "mir_options.h" -#include "mir_memory.h" static TCHAR* MyDBGetContactSettingTString(MCONTACT hContact, char* module, char* setting, TCHAR* out, size_t len, TCHAR *def) { diff --git a/plugins/Utils/mir_smileys.cpp b/plugins/Utils/mir_smileys.cpp index 8837fa573b..fc321c0a56 100644 --- a/plugins/Utils/mir_smileys.cpp +++ b/plugins/Utils/mir_smileys.cpp @@ -18,7 +18,6 @@ Boston, MA 02111-1307, USA. */ #include "mir_smileys.h" -#include "mir_memory.h" #include "utf8_helpers.h" #include -- cgit v1.2.3