From 3db0313f338d25593eeda9d60dd7b3c2f15394eb Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 14 Sep 2016 18:04:55 +0000 Subject: fix for 32-bit libs git-svn-id: http://svn.miranda-ng.org/main/trunk@17297 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- bin10/lib/mir_app.lib | Bin 77942 -> 77722 bytes bin10/lib/mir_app64.lib | Bin 74922 -> 74722 bytes bin12/lib/mir_app.lib | Bin 77942 -> 77722 bytes bin12/lib/mir_app64.lib | Bin 74922 -> 74722 bytes bin14/lib/mir_app.lib | Bin 77942 -> 77722 bytes bin14/lib/mir_app64.lib | Bin 74922 -> 74722 bytes plugins/MirFox/src/MirandaUtils.cpp | 4 ++-- plugins/MirLua/src/m_database.cpp | 2 +- src/mir_app/src/mir_app.def | 1 - 9 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bin10/lib/mir_app.lib b/bin10/lib/mir_app.lib index 5a9eaff3bd..b4cd3dad81 100644 Binary files a/bin10/lib/mir_app.lib and b/bin10/lib/mir_app.lib differ diff --git a/bin10/lib/mir_app64.lib b/bin10/lib/mir_app64.lib index fbf49e2bc9..4219f8dbce 100644 Binary files a/bin10/lib/mir_app64.lib and b/bin10/lib/mir_app64.lib differ diff --git a/bin12/lib/mir_app.lib b/bin12/lib/mir_app.lib index 5a9eaff3bd..b4cd3dad81 100644 Binary files a/bin12/lib/mir_app.lib and b/bin12/lib/mir_app.lib differ diff --git a/bin12/lib/mir_app64.lib b/bin12/lib/mir_app64.lib index fbf49e2bc9..4219f8dbce 100644 Binary files a/bin12/lib/mir_app64.lib and b/bin12/lib/mir_app64.lib differ diff --git a/bin14/lib/mir_app.lib b/bin14/lib/mir_app.lib index 5a9eaff3bd..b4cd3dad81 100644 Binary files a/bin14/lib/mir_app.lib and b/bin14/lib/mir_app.lib differ diff --git a/bin14/lib/mir_app64.lib b/bin14/lib/mir_app64.lib index fbf49e2bc9..4219f8dbce 100644 Binary files a/bin14/lib/mir_app64.lib and b/bin14/lib/mir_app64.lib differ diff --git a/plugins/MirFox/src/MirandaUtils.cpp b/plugins/MirFox/src/MirandaUtils.cpp index 93587d2d66..b3d859ba60 100644 --- a/plugins/MirFox/src/MirandaUtils.cpp +++ b/plugins/MirFox/src/MirandaUtils.cpp @@ -526,7 +526,7 @@ void MirandaUtils::translateOldDBNames() { } } - //delete db module - DbModule_Delete(0, OLD_PLUGIN_DB_ID); + // delete db module + db_delete_module(0, OLD_PLUGIN_DB_ID); } diff --git a/plugins/MirLua/src/m_database.cpp b/plugins/MirLua/src/m_database.cpp index 64715f01cf..c7c8c091f4 100644 --- a/plugins/MirLua/src/m_database.cpp +++ b/plugins/MirLua/src/m_database.cpp @@ -376,7 +376,7 @@ static int db_DeleteModule(lua_State *L) MCONTACT hContact = lua_tointeger(L, 1); LPCSTR szModule = luaL_checkstring(L, 2); - INT_PTR res = DbModule_Delete(hContact, szModule); + INT_PTR res = db_delete_module(hContact, szModule); lua_pushboolean(L, !res); return 1; diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index d4755280f1..b880ce3c31 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -291,4 +291,3 @@ Profile_GetNameW @291 Profile_GetPathA @292 Profile_GetPathW @293 Profile_SetDefault @294 -DbModule_Delete @295 NONAME -- cgit v1.2.3