diff options
author | George Hazan <george.hazan@gmail.com> | 2015-08-13 17:08:34 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2015-08-13 17:08:34 +0000 |
commit | 1ea84dc56d95ceaf85c036127c5045eba0ad50ee (patch) | |
tree | a8392d1877470f4d7513e3ad853fa843d564a544 /protocols/AimOscar/src/aim.cpp | |
parent | 5c84f735bc4f40d3f2f645d003ef9a08576878d8 (diff) |
massive name conflict resolution
git-svn-id: http://svn.miranda-ng.org/main/trunk@14941 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/AimOscar/src/aim.cpp')
-rw-r--r-- | protocols/AimOscar/src/aim.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/protocols/AimOscar/src/aim.cpp b/protocols/AimOscar/src/aim.cpp index 2355754267..6d595ae8e9 100644 --- a/protocols/AimOscar/src/aim.cpp +++ b/protocols/AimOscar/src/aim.cpp @@ -16,6 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
#include "stdafx.h"
char AIM_CAP_MIRANDA[16] = "MirandaA";
@@ -37,7 +38,7 @@ OBJLIST<CAimProto> g_Instances(1, sttCompareProtocols); /////////////////////////////////////////////////////////////////////////////////////////
// Dll entry point
-BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD /*fdwReason*/,LPVOID /*lpvReserved*/)
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD /*fdwReason*/, LPVOID /*lpvReserved*/)
{
hInstance = hinstDLL;
return TRUE;
@@ -71,7 +72,7 @@ extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD m /////////////////////////////////////////////////////////////////////////////////////////
// Interface information
-extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCOL, MIID_LAST};
+extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOCOL, MIID_LAST };
////////////////////////////////////////////////////////////////////////////////////////
// OnModulesLoaded - finalizes plugin's configuration on load
@@ -111,7 +112,7 @@ extern "C" int __declspec(dllexport) Load(void) pd.type = PROTOTYPE_PROTOCOL;
pd.fnInit = protoInit;
pd.fnUninit = protoUninit;
- Proto_RegisterModule( & pd);
+ Proto_RegisterModule(&pd);
InitIcons();
InitExtraIcons();
|