summaryrefslogtreecommitdiff
path: root/plugins/SmileyAdd/general.h
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2012-06-15 20:04:13 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2012-06-15 20:04:13 +0000
commite521b812384a0e93f48e078c6cb248913dcc893a (patch)
tree13b1de3e9bef13a48af0318f1fd338915dd69e9a /plugins/SmileyAdd/general.h
parentae481600939fb5420b80a8a7ef84f0ce9d6b3356 (diff)
another portion of "#ifsef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@437 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/SmileyAdd/general.h')
-rw-r--r--plugins/SmileyAdd/general.h21
1 files changed, 0 insertions, 21 deletions
diff --git a/plugins/SmileyAdd/general.h b/plugins/SmileyAdd/general.h
index 72bdc217ba..8cc13c5619 100644
--- a/plugins/SmileyAdd/general.h
+++ b/plugins/SmileyAdd/general.h
@@ -51,8 +51,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma warning( disable : 4275 )
#pragma warning( disable : 4390 )
-#if defined _UNICODE || defined UNICODE
-
#include <wcpattern.h>
#include <wcmatcher.h>
@@ -60,17 +58,6 @@ typedef WCPattern _TPattern;
typedef WCMatcher _TMatcher;
#define createTMatcher createWCMatcher
-#else
-
-#include <pattern.h>
-#include <matcher.h>
-
-typedef Pattern _TPattern;
-typedef Matcher _TMatcher;
-#define createTMatcher createMatcher
-
-#endif
-
#pragma warning( pop )
#define _MT
@@ -164,18 +151,10 @@ public:
operator char*() const { return m_psz; }
};
-#if defined _UNICODE || defined UNICODE
#define T2A_SM (char*)W2A_SM
#define T2W_SM(p1) (wchar_t*)p1
#define A2T_SM (wchar_t*)A2W_SM
#define W2T_SM(p1) (TCHAR*)p1
-#else
-#define T2A_SM(p1) (char*)p1
-#define T2W_SM A2W_SM
-#define A2T_SM(p1) (TCHAR*)p1
-#define W2T_SM W2A_SM
-#endif
-
template<class T> struct SMOBJLIST : public OBJLIST<T>
{