From d5d023f683b23fe26ddea93738cb721d532804f0 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Thu, 14 Jun 2012 16:22:13 +0000 Subject: another portion of "#ifsef Unicode" removal git-svn-id: http://svn.miranda-ng.org/main/trunk@411 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/IRCG/irclib.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'protocols/IRCG/irclib.cpp') diff --git a/protocols/IRCG/irclib.cpp b/protocols/IRCG/irclib.cpp index a5d3ad1537..78d33f11dc 100644 --- a/protocols/IRCG/irclib.cpp +++ b/protocols/IRCG/irclib.cpp @@ -308,7 +308,6 @@ int CIrcProto::NLSend( const TCHAR* fmt, ...) return result; } -#if defined( _UNICODE ) int CIrcProto::NLSend( const char* fmt, ...) { va_list marker; @@ -320,7 +319,6 @@ int CIrcProto::NLSend( const char* fmt, ...) return NLSend((unsigned char*)szBuf, cbLen ); } -#endif int CIrcProto::NLSendNoScript( const unsigned char* buf, int cbBuf) { @@ -355,15 +353,8 @@ void CIrcProto::createMessageFromPchar( const char* p ) { TCHAR* ptszMsg; if ( codepage != CP_UTF8 && m_utfAutodetect ) { - #if defined( _UNICODE ) - if ( mir_utf8decodecp( NEWSTR_ALLOCA(p), codepage, &ptszMsg ) == NULL ) + if ( mir_utf8decodecp( NEWSTR_ALLOCA(p), codepage, &ptszMsg ) == NULL ) ptszMsg = mir_a2t_cp( p, codepage ); - #else - if ( mir_utf8decodecp( NEWSTR_ALLOCA(p), codepage, NULL ) == NULL ) - ptszMsg = mir_a2t_cp( p, codepage ); - else - ptszMsg = mir_strdup( p ); - #endif } else ptszMsg = mir_a2t_cp( p, codepage ); CIrcMessage msg( this, ptszMsg, codepage, true ); -- cgit v1.2.3