From 1ea84dc56d95ceaf85c036127c5045eba0ad50ee Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 13 Aug 2015 17:08:34 +0000 Subject: massive name conflict resolution git-svn-id: http://svn.miranda-ng.org/main/trunk@14941 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/AimOscar/src/defines.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'protocols/AimOscar/src/defines.h') diff --git a/protocols/AimOscar/src/defines.h b/protocols/AimOscar/src/defines.h index 95e756d119..2caf13aa05 100644 --- a/protocols/AimOscar/src/defines.h +++ b/protocols/AimOscar/src/defines.h @@ -305,7 +305,7 @@ public: unsigned short LocalPort;// our port //Peer connection stuff - HANDLE hNetlibPeer;//handle to the peer netlib + HANDLE m_hNetlibPeer;//handle to the peer netlib HANDLE hDirectBoundPort;//direct connection listening port HANDLE current_rendezvous_accept_user;//hack @@ -322,12 +322,12 @@ public: unsigned int services_size;//current services size //Some mail connection stuff - HANDLE hMailConn; + HANDLE m_hMailConn; unsigned short mail_seqno; int mail_packet_offset; //avatar connection stuff - HANDLE hAvatarConn; + HANDLE m_hAvatarConn; unsigned short avatar_seqno; HANDLE hAvatarEvent; bool AvatarLimitThread; -- cgit v1.2.3