From d3cb19278d60ac6f7963379254546cdca36a90e2 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 14 Jan 2017 01:22:55 +0300 Subject: separate handle types for HNETLIBCONN & HNETLIBBIND --- protocols/IcqOscarJ/src/icq_direct.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'protocols/IcqOscarJ/src/icq_direct.cpp') diff --git a/protocols/IcqOscarJ/src/icq_direct.cpp b/protocols/IcqOscarJ/src/icq_direct.cpp index d87b215704..f7d0ea13fb 100644 --- a/protocols/IcqOscarJ/src/icq_direct.cpp +++ b/protocols/IcqOscarJ/src/icq_direct.cpp @@ -29,7 +29,7 @@ struct directthreadstartinfo { int type; // Only valid for outgoing connections int incoming; // 1=incoming, 0=outgoing - HANDLE hConnection; // only valid for incoming connections, handle to the connection + HNETLIBCONN hConnection; // only valid for incoming connections, handle to the connection MCONTACT hContact; // Only valid for outgoing connections void* pvExtra; // Only valid for outgoing connections }; @@ -50,7 +50,7 @@ void CIcqProto::CloseContactDirectConns(MCONTACT hContact) for (int i = 0; i < directConns.getCount(); i++) { if (!hContact || directConns[i]->hContact == hContact) { - HANDLE hConnection = directConns[i]->hConnection; + HNETLIBCONN hConnection = directConns[i]->hConnection; directConns[i]->hConnection = NULL; // do not allow reuse NetLib_CloseConnection(&hConnection, FALSE); @@ -105,7 +105,7 @@ int CIcqProto::sendDirectPacket(directconnect* dc, icq_packet* pkt) return nResult; } -directthreadstartinfo* CreateDTSI(MCONTACT hContact, HANDLE hConnection, int type) +directthreadstartinfo* CreateDTSI(MCONTACT hContact, HNETLIBCONN hConnection, int type) { directthreadstartinfo *dtsi = (directthreadstartinfo*)SAFE_MALLOC(sizeof(directthreadstartinfo)); dtsi->hContact = hContact; @@ -159,7 +159,7 @@ BOOL CIcqProto::IsDirectConnectionOpen(MCONTACT hContact, int type, int bPassive // This function is called from the Netlib when someone is connecting to // one of our incomming DC ports -void icq_newConnectionReceived(HANDLE hNewConnection, DWORD, void *pExtra) +void icq_newConnectionReceived(HNETLIBCONN hNewConnection, DWORD, void *pExtra) { // Start a new thread for the incomming connection CIcqProto* ppro = (CIcqProto*)pExtra; -- cgit v1.2.3