removed _EXPORTS

removed not used headers

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

3 files changed, 7 insertions, 23 deletions

diff --git a/plugins/AssocMgr/assocmgr_11.vcxproj b/plugins/AssocMgr/assocmgr_11.vcxproj
index 66c7500954..035669977d 100644
--- a/plugins/AssocMgr/assocmgr_11.vcxproj
+++ b/plugins/AssocMgr/assocmgr_11.vcxproj
@@ -82,7 +82,7 @@
       <MinimalRebuild>true</MinimalRebuild>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ASSOCMGR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

@@ -98,9 +98,9 @@
       <SubSystem>Windows</SubSystem>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <BaseAddress>0x24300000</BaseAddress>

-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>

+      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

@@ -111,7 +111,7 @@
       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;ASSOCMGR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

@@ -140,7 +140,7 @@
       <Optimization>Full</Optimization>

       <WarningLevel>Level3</WarningLevel>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ASSOCMGR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

@@ -172,7 +172,7 @@
       <Optimization>Full</Optimization>

       <WarningLevel>Level3</WarningLevel>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;ASSOCMGR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

diff --git a/plugins/AssocMgr/src/common.h b/plugins/AssocMgr/src/common.h
index 149253dee7..4b3a334afd 100644
--- a/plugins/AssocMgr/src/common.h
+++ b/plugins/AssocMgr/src/common.h
@@ -21,17 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #define _CRT_SECURE_NO_WARNINGS

 #define _WIN32_WINNT 0x0600

-#define __RPCASYNC_H__         /* VC6 has a mistake in there (warning) */

-#include <windows.h>

-#pragma warning(disable:4201)  /* nonstandard extension used : nameless struct/union */

-#pragma warning(disable:4115)  /* V6 has a mistake in there (warning) */

 #include <shlobj.h>            /* for SHChangeNotify() */

-#pragma warning(default:4115)

-#include <commctrl.h>

-#pragma warning(default:4201)

-#include <tchar.h>

-#include <stdio.h>             /* for mir_snprintf() */

-#include <Vsstyle.h>

 #include <Vssym32.h>

 #include <malloc.h>

 

@@ -39,15 +29,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <newpluginapi.h>

 #include <m_system.h>

 #include <m_database.h>

-#include <m_utils.h>

 #include <m_langpack.h>

 #include <m_options.h>

-#include <m_skin.h>

 #include <m_clist.h>

 #include "win2k.h"

 

 #define ASSOCMGR_NOHELPERFUNCTIONS

+

 #include "m_assocmgr.h"

+

 #include "utils.h"

 #include "reg.h"

 #include "assoclist.h"

diff --git a/plugins/AssocMgr/src/version.h b/plugins/AssocMgr/src/version.h
index 78a6f80c69..057952376a 100644
--- a/plugins/AssocMgr/src/version.h
+++ b/plugins/AssocMgr/src/version.h
@@ -25,14 +25,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define __BUILD_NUM					0

 

 #define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

-#define __FILEVERSION_DOTS			__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM

-

-#define __STRINGIFY_IMPL(x)			#x

-#define __STRINGIFY(x)				__STRINGIFY_IMPL(x)

-#define __VERSION_STRING			__STRINGIFY(__FILEVERSION_DOTS)

 

 #define __PLUGIN_NAME				"File Association Manager"

-#define __INTERNAL_NAME				"AssocMgr"

 #define __FILENAME					"AssocMgr.dll"

 #define __DESCRIPTION 				"Handles file type associations and URLs like aim, ymsgr, xmpp, wpmsg, gg, tlen."

 #define __AUTHOR					"H. Herkenrath"