summaryrefslogtreecommitdiff
path: root/protocols/IRCG/irc.h
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2012-06-14 16:22:13 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2012-06-14 16:22:13 +0000
commitd5d023f683b23fe26ddea93738cb721d532804f0 (patch)
tree21e7398686c7a5d1604d58bfb71ca4329c84be66 /protocols/IRCG/irc.h
parente58823d961a630eb62e60d2ccb443761ba5f1704 (diff)
another portion of "#ifsef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@411 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/IRCG/irc.h')
-rw-r--r--protocols/IRCG/irc.h14
1 files changed, 4 insertions, 10 deletions
diff --git a/protocols/IRCG/irc.h b/protocols/IRCG/irc.h
index 13ec720381..823efec68e 100644
--- a/protocols/IRCG/irc.h
+++ b/protocols/IRCG/irc.h
@@ -515,9 +515,7 @@ struct CIrcProto : public PROTO_INTERFACE, public CCallocBase
INT_PTR DoEvent(int iEvent, const TCHAR* pszWindow, const TCHAR* pszNick, const TCHAR* pszText, const TCHAR* pszStatus, const TCHAR* pszUserInfo, DWORD_PTR dwItemData, bool bAddToLog, bool bIsMe,time_t timestamp = 1);
void FindLocalIP(HANDLE con);
bool FreeWindowItemData(CMString window, CHANNELINFO* wis);
- #if defined( _UNICODE )
- bool IsChannel(const char* sName);
- #endif
+ bool IsChannel(const char* sName);
bool IsChannel(const TCHAR* sName);
void KillChatTimer(UINT_PTR &nIDEvent);
CMString MakeWndID(const TCHAR* sWindow);
@@ -578,9 +576,7 @@ struct CIrcProto : public PROTO_INTERFACE, public CCallocBase
void Disconnect(void);
void KillIdent(void);
- #if defined( _UNICODE )
- int NLSend(const TCHAR* fmt, ...);
- #endif
+ int NLSend(const TCHAR* fmt, ...);
int NLSend(const char* fmt, ...);
int NLSend(const unsigned char* buf, int cbBuf);
int NLSendNoScript( const unsigned char* buf, int cbBuf);
@@ -733,10 +729,8 @@ TCHAR* __stdcall my_strstri(const TCHAR *s1, const TCHAR *s2) ;
TCHAR* __stdcall DoColorCodes (const TCHAR* text, bool bStrip, bool bReplacePercent);
char* __stdcall rtrim( char *string );
-#if defined( _UNICODE )
- String& __stdcall ReplaceString (String& text, const char* replaceme, const char* newword);
- String __stdcall GetWord(const char* text, int index);
-#endif
+String& __stdcall ReplaceString (String& text, const char* replaceme, const char* newword);
+String __stdcall GetWord(const char* text, int index);
#define NEWSTR_ALLOCA(A) (A==NULL)?NULL:strcpy((char*)alloca(strlen(A)+1),A)
#define NEWTSTR_ALLOCA(A) (A==NULL)?NULL:_tcscpy((TCHAR*)alloca(sizeof(TCHAR)*(_tcslen(A)+1)),A)