diff options
| author | George Hazan <ghazan@miranda.im> | 2018-11-26 14:41:11 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-11-26 14:41:21 +0300 |
| commit | be1918c1b2986ddb387cd593deddf120f9e61874 (patch) | |
| tree | cedf0b0983817b488edcc7eb604f2d44a75c935f /src/mir_app | |
| parent | 91c5b3baaf5ac2790a99015afcfbf696dff682ca (diff) | |
fix for chat structures declaration
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/src/chat.h | 4 | ||||
| -rw-r--r-- | src/mir_app/src/chat_manager.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/chat_svc.cpp | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/mir_app/src/chat.h b/src/mir_app/src/chat.h index ea86c7cea7..c86cc9b16f 100644 --- a/src/mir_app/src/chat.h +++ b/src/mir_app/src/chat.h @@ -28,10 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. void Srmm_CreateToolbarIcons(HWND hwndDlg, int flags);
void Srmm_ProcessToolbarHotkey(MCONTACT hContact, INT_PTR iButtonFrom, HWND hwndDlg);
-struct MODULEINFO : public GCModuleInfoBase {};
-struct LOGSTREAMDATA : public GCLogStreamDataBase {};
-struct SESSION_INFO : public GCSessionInfoBase {};
-
class CChatRoomDlg : public CSrmmBaseDialog
{
CChatRoomDlg(); // just to suppress compiler's warnings, never implemented
diff --git a/src/mir_app/src/chat_manager.cpp b/src/mir_app/src/chat_manager.cpp index f51d1f2811..2c2569ccaa 100644 --- a/src/mir_app/src/chat_manager.cpp +++ b/src/mir_app/src/chat_manager.cpp @@ -987,7 +987,7 @@ MIR_APP_DLL(CHAT_MANAGER*) Chat_CustomizeApi(const CHAT_MANAGER_INITDATA *pInit) for (auto &p : g_arSessions) {
SESSION_INFO *p1 = (SESSION_INFO*)realloc(p, pInit->cbSession);
- memset(PBYTE(p1) + sizeof(GCSessionInfoBase), 0, pInit->cbSession - sizeof(GCSessionInfoBase));
+ memset(PBYTE(p1) + sizeof(SESSION_INFO), 0, pInit->cbSession - sizeof(SESSION_INFO));
if (p1 != p) { // realloc could change a pointer, reinsert a structure
g_arSessions.remove(p);
g_arSessions.insert(p1);
diff --git a/src/mir_app/src/chat_svc.cpp b/src/mir_app/src/chat_svc.cpp index daaab3b654..7e76a5f41f 100644 --- a/src/mir_app/src/chat_svc.cpp +++ b/src/mir_app/src/chat_svc.cpp @@ -180,7 +180,7 @@ MIR_APP_DLL(int) Chat_Register(const GCREGISTER *gcr) /////////////////////////////////////////////////////////////////////////////////////////
// starts new chat session
-EXTERN_C MIR_APP_DLL(GCSessionInfoBase*) Chat_NewSession(
+EXTERN_C MIR_APP_DLL(SESSION_INFO*) Chat_NewSession(
int iType, // Use one of the GCW_* flags above to set the type of session
const char *pszModule, // The name of the protocol owning the session (the same as pszModule when you register)
const wchar_t *ptszID, // The unique identifier for the session.
|