1 files changed, 3 insertions, 21 deletions
diff --git a/include/m_db_int.h b/include/m_db_int.h
index 81ce096276..806dc3a06f 100644
--- a/include/m_db_int.h
+++ b/include/m_db_int.h
@@ -222,20 +222,13 @@ struct DATABASELINK
 ///////////////////////////////////////////////////////////////////////////////
 // cache access function
 
-#if defined(__cplusplus)
-extern "C"
-{
-#endif
-
-MIR_CORE_DLL(DBCachedContact*) db_get_contact(MCONTACT);
-
-#if defined(__cplusplus)
-}
-#endif
+EXTERN_C MIR_CORE_DLL(DBCachedContact*) db_get_contact(MCONTACT);
 
 ///////////////////////////////////////////////////////////////////////////////
 // Database list's services
 
+EXTERN_C MIR_CORE_DLL(MIDatabase*) db_get_current(void);
+
 // MS_DB_REGISTER_PLUGIN : registers a database plugin
 // wParam : 0 (unused)
 // lParam : DATABASELINK* = database link description
@@ -257,17 +250,6 @@ __forceinline DATABASELINK* FindDatabasePlugin(const wchar_t* ptszFileName)
 {	return (DATABASELINK*)CallService(MS_DB_FIND_PLUGIN, 0, (LPARAM)ptszFileName);
 }
 
-// MS_DB_GET_CURRENT : returns the database pointer for the current profile
-// wParam : 0 (unused)
-// lParam : 0 (unused)
-// returns MIDatabase* of the current profile or NULL on error
-
-#define MS_DB_GET_CURRENT "DB/GetCurrentDb"
-
-__forceinline MIDatabase* GetCurrentDatabase(void)
-{	return (MIDatabase*)CallService(MS_DB_GET_CURRENT, 0, 0);
-}
-
 // MS_DB_INIT_INSTANCE : initializes a database instance
 // wParam : 0 (unused)
 // lParam : MIDatabase* = pointer to a database instance