diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-07-06 14:44:59 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-07-06 14:44:59 +0000 |
| commit | 1ed1296853c671fc557599c6daf5fba88d52a21f (patch) | |
| tree | e67180dcb6c6b3362d0ec4a597c334353337a644 /protocols/IRCG | |
| parent | e255337491b93977d00bd364d31ef943e821d22a (diff) | |
+ stdauth + stdfile;
NEWSTR_ALLOCA / NEWTSTR_ALLOCA / NEWWSTR_ALLOCA moved to m_system.h
git-svn-id: http://svn.miranda-ng.org/main/trunk@792 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/IRCG')
| -rw-r--r-- | protocols/IRCG/irc.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/protocols/IRCG/irc.h b/protocols/IRCG/irc.h index 41591b388a..4580243385 100644 --- a/protocols/IRCG/irc.h +++ b/protocols/IRCG/irc.h @@ -407,7 +407,7 @@ struct CIrcProto : public PROTO_INTERFACE, public CCallocBase CWhoisDlg* m_whoisDlg;
CQuickDlg* m_quickDlg;
CIgnorePrefsDlg* m_ignoreDlg;
-
+
int m_noOfChannels, m_manualWhoisCount;
String sChannelModes, sUserModes;
CMString sChannelPrefixes, sUserModePrefixes, WhoisAwayReply;
@@ -424,7 +424,7 @@ struct CIrcProto : public PROTO_INTERFACE, public CCallocBase BOOL CList_AddDCCChat(const CMString& name, const CMString& hostmask, unsigned long adr, int port) ;
//commandmonitor.cpp
- UINT_PTR IdentTimer, InitTimer, KeepAliveTimer, OnlineNotifTimer, OnlineNotifTimer3;
+ UINT_PTR IdentTimer, InitTimer, KeepAliveTimer, OnlineNotifTimer, OnlineNotifTimer3;
int AddOutgoingMessageToDB(HANDLE hContact, TCHAR* msg);
bool DoOnConnect(const CIrcMessage *pmsg);
@@ -561,14 +561,14 @@ struct CIrcProto : public PROTO_INTERFACE, public CCallocBase void AddDCCSession(DCCINFO* pdci, CDccSession* dcc);
void RemoveDCCSession(HANDLE hContact);
void RemoveDCCSession(DCCINFO* pdci);
-
+
CDccSession* FindDCCSession(HANDLE hContact);
CDccSession* FindDCCSession(DCCINFO* pdci);
CDccSession* FindDCCSendByPort(int iPort);
CDccSession* FindDCCRecvByPortAndName(int iPort, const TCHAR* szName);
CDccSession* FindPassiveDCCSend(int iToken);
CDccSession* FindPassiveDCCRecv(CMString sName, CMString sToken);
-
+
void DisconnectAllDCCSessions(bool Shutdown);
void CheckDCCTimeout(void);
@@ -731,9 +731,6 @@ TCHAR* __stdcall DoColorCodes (const TCHAR* text, bool bStrip, bool bRepla 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)
-
#pragma comment(lib,"comctl32.lib")
#endif
|