removed not needed interfaces

git-svn-id: http://svn.miranda-ng.org/main/trunk@3508 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 8 insertions, 38 deletions

diff --git a/plugins/Ping/src/common.h b/plugins/Ping/src/common.h
index 23fb4c676e..e4e338cc34 100644
--- a/plugins/Ping/src/common.h
+++ b/plugins/Ping/src/common.h
@@ -118,8 +118,4 @@ extern HINSTANCE hInst;
 

 extern bool use_raw_ping;

 

-#ifndef MIID_PING

-#define MIID_PING	{0x9cd1684e, 0xc520, 0x4b58, { 0x9a, 0x52, 0xae, 0x3d, 0x7a, 0x72, 0x4, 0x46}}

-#endif

-

 #endif

diff --git a/plugins/Ping/src/ping.cpp b/plugins/Ping/src/ping.cpp
index 10803ce5c5..7e3863ae81 100644
--- a/plugins/Ping/src/ping.cpp
+++ b/plugins/Ping/src/ping.cpp
@@ -19,30 +19,22 @@ PLUGININFOEX pluginInfo={
 	"mail@scottellis.com.au",

 	"© 2005 Scott Ellis",

 	"http://www.scottellis.com.au/",

-	UNICODE_AWARE,		//not transient

-	{ 0x760ea901, 0xc0c2, 0x446c, { 0x80, 0x29, 0x94, 0xc3, 0xbc, 0x47, 0xc4, 0x5e } } // {760EA901-C0C2-446c-8029-94C3BC47C45E}

+	UNICODE_AWARE,

+	// {760EA901-C0C2-446c-8029-94C3BC47C45E}

+	{0x760ea901, 0xc0c2, 0x446c, {0x80, 0x29, 0x94, 0xc3, 0xbc, 0x47, 0xc4, 0x5e}}

 };

 

-extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)

+extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

 {

-	hInst=hinstDLL;

-	DisableThreadLibraryCalls(hInst);

+	hInst = hinstDLL;

 	return TRUE;

 }

 

-extern "C" PING_API PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

 {

 	return &pluginInfo;

 }

 

-static const MUUID interfaces[] = {MIID_PING, MIID_LAST};

-extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)

-{

-	return interfaces;

-}

-

-

-

 void CreatePluginServices() {

 	// general

 	CreateServiceFunction(PLUG "/Ping", PluginPing);

@@ -128,7 +120,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam) {
 	return 0;

 }

 

-extern "C" PING_API int Load(void)

+extern "C" __declspec(dllexport) int Load(void)

 {

 	//if(init_raw_ping()) {

 		//MessageBox(0, Translate("Failed to initialize. Plugin disabled."), Translate("Ping Plugin"), MB_OK | MB_ICONERROR);

@@ -162,7 +154,7 @@ extern "C" PING_API int Load(void)
 	return 0;

 }

 

-extern "C" PING_API int Unload(void)

+extern "C" __declspec(dllexport) int Unload(void)

 {

 	SavePingList(0, 0);

 

diff --git a/plugins/Ping/src/ping.h b/plugins/Ping/src/ping.h
index 8a1b1730bd..b45586914d 100644
--- a/plugins/Ping/src/ping.h
+++ b/plugins/Ping/src/ping.h
@@ -7,21 +7,12 @@ http://miranda-icq.sourceforge.net/
 

 */

 

-#ifndef _PING

-#define _PING

-

-

 // The following ifdef block is the standard way of creating macros which make exporting 

 // from a DLL simpler. All files within this DLL are compiled with the PINGPROTO_EXPORTS

 // symbol defined on the command line. this symbol should not be defined on any project

 // that uses this DLL. This way any other project whose source files include this file see 

 // PINGPROTO_API functions as being imported from a DLL, wheras this DLL sees symbols

 // defined with this macro as being exported.

-#ifdef PING_EXPORTS

-#define PING_API __declspec(dllexport)

-#else

-#define PING_API __declspec(dllimport)

-#endif

 

 #include "utils.h"

 #include "options.h"

@@ -30,12 +21,3 @@ http://miranda-icq.sourceforge.net/
 #include "pingthread.h"

 #include "menu.h"

 #include "rawping.h"

-

-// globals

-extern PLUGININFOEX pluginInfo;

-

-extern "C" PING_API PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion);

-extern "C" PING_API int Load(void);

-extern "C" PING_API int Unload(void);

-

-#endif