summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/m_protocols.h8
-rw-r--r--src/core/miranda.h1
2 files changed, 5 insertions, 4 deletions
diff --git a/include/m_protocols.h b/include/m_protocols.h
index f4932f1b77..15da03bc01 100644
--- a/include/m_protocols.h
+++ b/include/m_protocols.h
@@ -30,6 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
struct PROTO_INTERFACE;
#include "statusmodes.h"
+#include <m_core.h>
// send a general request through the protocol chain for a contact
// wParam = 0
@@ -223,9 +224,10 @@ typedef struct {
// NULL if it isn't.
#define MS_PROTO_ISPROTOCOLLOADED "Proto/IsProtocolLoaded"
-__forceinline PROTOCOLDESCRIPTOR* IsProtocolLoaded(const char *szProto)
-{ return (PROTOCOLDESCRIPTOR*)CallService(MS_PROTO_ISPROTOCOLLOADED, 0, (LPARAM)szProto);
-}
+#ifdef __cplusplus
+extern "C"
+#endif
+MIR_CORE_DLL(PROTOCOLDESCRIPTOR*) Proto_IsProtocolLoaded(const char *szProtoName);
// gets the network-level protocol associated with a contact
// wParam = (MCONTACT)hContact
diff --git a/src/core/miranda.h b/src/core/miranda.h
index c079e26324..88ee4b92f7 100644
--- a/src/core/miranda.h
+++ b/src/core/miranda.h
@@ -214,6 +214,5 @@ extern "C"
MIR_CORE_DLL(int) GetSubscribersCount(HANDLE hHook);
MIR_CORE_DLL(void) db_setCurrent(MIDatabase* _db);
- MIR_CORE_DLL(PROTOCOLDESCRIPTOR*) Proto_IsProtocolLoaded(const char *szProtoName);
MIR_CORE_DLL(PROTOCOLDESCRIPTOR*) Proto_RegisterModule(PROTOCOLDESCRIPTOR *pd);
};