summaryrefslogtreecommitdiff
path: root/plugins/AssocMgr/src
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2015-04-24 21:10:03 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2015-04-24 21:10:03 +0000
commitd41cb4808c648d458be7615d6a72003e3614538d (patch)
treea24750dd6b7a5a80ef02dd09ec31152e1198fd99 /plugins/AssocMgr/src
parenta7fd1ec72196095ebeef4cc67cde5135c2d1d9a8 (diff)
AssocMgr - common project
git-svn-id: http://svn.miranda-ng.org/main/trunk@13109 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/AssocMgr/src')
-rw-r--r--plugins/AssocMgr/src/assoclist.cpp2
-rw-r--r--plugins/AssocMgr/src/dde.cpp2
-rw-r--r--plugins/AssocMgr/src/main.cpp6
-rw-r--r--plugins/AssocMgr/src/reg.cpp2
-rw-r--r--plugins/AssocMgr/src/stdafx.cxx (renamed from plugins/AssocMgr/src/stdafx.cpp)2
-rw-r--r--plugins/AssocMgr/src/stdafx.h (renamed from plugins/AssocMgr/src/common.h)2
-rw-r--r--plugins/AssocMgr/src/test.cpp2
-rw-r--r--plugins/AssocMgr/src/utils.cpp2
8 files changed, 9 insertions, 11 deletions
diff --git a/plugins/AssocMgr/src/assoclist.cpp b/plugins/AssocMgr/src/assoclist.cpp
index cc343e2f45..b941acf106 100644
--- a/plugins/AssocMgr/src/assoclist.cpp
+++ b/plugins/AssocMgr/src/assoclist.cpp
@@ -19,7 +19,7 @@ along with this program (AssocMgr-License.txt); if not, write to the Free Softw
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "common.h"
+#include "stdafx.h"
/* Options */
extern HINSTANCE hInst;
diff --git a/plugins/AssocMgr/src/dde.cpp b/plugins/AssocMgr/src/dde.cpp
index 5ffc17add7..5fb674b22a 100644
--- a/plugins/AssocMgr/src/dde.cpp
+++ b/plugins/AssocMgr/src/dde.cpp
@@ -19,7 +19,7 @@ along with this program (AssocMgr-License.txt); if not, write to the Free Softwa
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "common.h"
+#include "stdafx.h"
/* Conversation */
extern HINSTANCE hInst;
diff --git a/plugins/AssocMgr/src/main.cpp b/plugins/AssocMgr/src/main.cpp
index fcf1d3543e..4d57f89a76 100644
--- a/plugins/AssocMgr/src/main.cpp
+++ b/plugins/AssocMgr/src/main.cpp
@@ -19,7 +19,7 @@ along with this program (AssocMgr-License.txt); if not, write to the Free Softwa
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "common.h"
+#include "stdafx.h"
HINSTANCE hInst;
static HANDLE hHookModulesLoaded;
@@ -39,7 +39,7 @@ PLUGININFOEX pluginInfo = {
{0x52685cd7, 0xec7, 0x44c1, {0xa1, 0xa6, 0x38, 0x16, 0x12, 0x41, 0x82, 0x2}}
};
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID)
{
hInst = hinstDLL;
return TRUE;
@@ -82,7 +82,7 @@ static int AssocMgrModulesLoaded(WPARAM,LPARAM)
return 0;
}
-extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD)
{
return &pluginInfo;
}
diff --git a/plugins/AssocMgr/src/reg.cpp b/plugins/AssocMgr/src/reg.cpp
index 0dcb9eae85..5ebba3dea9 100644
--- a/plugins/AssocMgr/src/reg.cpp
+++ b/plugins/AssocMgr/src/reg.cpp
@@ -19,7 +19,7 @@ along with this program (AssocMgr-License.txt); if not, write to the Free Softwa
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "common.h"
+#include "stdafx.h"
extern HINSTANCE hInst;
diff --git a/plugins/AssocMgr/src/stdafx.cpp b/plugins/AssocMgr/src/stdafx.cxx
index c5fe5abaad..6fb37564b7 100644
--- a/plugins/AssocMgr/src/stdafx.cpp
+++ b/plugins/AssocMgr/src/stdafx.cxx
@@ -15,4 +15,4 @@ 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 "common.h" \ No newline at end of file
+#include "stdafx.h" \ No newline at end of file
diff --git a/plugins/AssocMgr/src/common.h b/plugins/AssocMgr/src/stdafx.h
index c7ea172927..89cf724b45 100644
--- a/plugins/AssocMgr/src/common.h
+++ b/plugins/AssocMgr/src/stdafx.h
@@ -19,8 +19,6 @@ along with this program (AssocMgr-License.txt); if not, write to the Free Softwa
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#define _CRT_SECURE_NO_WARNINGS
-#define _WIN32_WINNT 0x0600
#include <shlobj.h> /* for SHChangeNotify() */
#include <Vssym32.h>
#include <malloc.h>
diff --git a/plugins/AssocMgr/src/test.cpp b/plugins/AssocMgr/src/test.cpp
index 70642bd272..f5c404fcc1 100644
--- a/plugins/AssocMgr/src/test.cpp
+++ b/plugins/AssocMgr/src/test.cpp
@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// -- Includes
-#include "common.h"
+#include "stdafx.h"
/*
#define AIM_SUPPORT_TEST
diff --git a/plugins/AssocMgr/src/utils.cpp b/plugins/AssocMgr/src/utils.cpp
index d1d5dad270..5c6d08da24 100644
--- a/plugins/AssocMgr/src/utils.cpp
+++ b/plugins/AssocMgr/src/utils.cpp
@@ -19,7 +19,7 @@ along with this program (AssocMgr-License.txt); if not, write to the Free Softwa
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "common.h"
+#include "stdafx.h"
/************************* String Conv ****************************/