From 782cd67c8a32808b6779cd286de7228a02006d0b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 17 Apr 2018 21:18:31 +0300 Subject: name conflict resolution --- protocols/Gadu-Gadu/src/gg_proto.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'protocols/Gadu-Gadu/src/gg_proto.h') diff --git a/protocols/Gadu-Gadu/src/gg_proto.h b/protocols/Gadu-Gadu/src/gg_proto.h index 2a2ed13659..ddeaa82cb9 100644 --- a/protocols/Gadu-Gadu/src/gg_proto.h +++ b/protocols/Gadu-Gadu/src/gg_proto.h @@ -134,12 +134,6 @@ struct GaduProto : public PROTO void __cdecl setavatarthread(void*); /* File transfer functions */ - HANDLE fileallow(MCONTACT hContact, HANDLE hTransfer, const wchar_t* szPath); - int filecancel(MCONTACT hContact, HANDLE hTransfer); - int filedeny(MCONTACT hContact, HANDLE hTransfer, const wchar_t* szReason); - int recvfile(MCONTACT hContact, PROTORECVFILE* pre); - HANDLE sendfile(MCONTACT hContact, const wchar_t* szDescription, wchar_t** ppszFiles); - HANDLE dccfileallow(HANDLE hTransfer, const wchar_t* szPath); HANDLE dcc7fileallow(HANDLE hTransfer, const wchar_t* szPath); @@ -226,8 +220,8 @@ struct GaduProto : public PROTO GGTHREAD pth_dcc; GGTHREAD pth_sess; GGTHREAD pth_avatar; - struct gg_session *sess; - struct gg_dcc *dcc; + struct gg_session *m_sess; + struct gg_dcc *m_dcc; HANDLE hEvent; HANDLE hConnStopEvent; SOCKET sock; -- cgit v1.2.3