summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-06-02 21:37:34 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-06-02 21:37:34 +0000
commit0e38286cbb667140631087811610a375c3e64b48 (patch)
tree6d11a284ee95a3f41dfb7c8e20cf4e5b7e6e285d
parentf5ca4831f6f344bba380505935bea96237eae621 (diff)
git-svn-id: http://svn.miranda-ng.org/main/trunk@277 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--bin10/mir_full.sln8
-rw-r--r--plugins/AutoRun/autorun.h2
-rw-r--r--plugins/ClientChangeNotify/ClientChangeNotify.cpp2
-rw-r--r--plugins/UserGuide/commonheaders.h2
-rw-r--r--plugins/YAPP/common.h2
5 files changed, 7 insertions, 9 deletions
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index 6af0ec94ac..e1e86ecb05 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -767,13 +767,9 @@ Global
{E26D2311-C164-48CF-BA24-5CEDA873D1B2}.Release|x64.ActiveCfg = Release|x64
{E26D2311-C164-48CF-BA24-5CEDA873D1B2}.Release|x64.Build.0 = Release|x64
{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Debug|Win32.ActiveCfg = Debug|Win32
- {6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Debug|Win32.Build.0 = Debug|Win32
{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Debug|x64.ActiveCfg = Debug|x64
- {6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Debug|x64.Build.0 = Debug|x64
{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Release|Win32.ActiveCfg = Release|Win32
- {6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Release|Win32.Build.0 = Release|Win32
{6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Release|x64.ActiveCfg = Release|x64
- {6DE11A47-2268-4B08-8DE5-15A1705FCE28}.Release|x64.Build.0 = Release|x64
{D726A7E5-CF4C-4CF2-A2D3-073DECEC0260}.Debug|Win32.ActiveCfg = Debug|Win32
{D726A7E5-CF4C-4CF2-A2D3-073DECEC0260}.Debug|Win32.Build.0 = Debug|Win32
{D726A7E5-CF4C-4CF2-A2D3-073DECEC0260}.Debug|x64.ActiveCfg = Debug|x64
@@ -1076,13 +1072,9 @@ Global
{F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}.Release|x64.ActiveCfg = Release|x64
{F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}.Release|x64.Build.0 = Release|x64
{C619A811-8023-4441-B3D7-785388A09DF0}.Debug|Win32.ActiveCfg = Debug|Win32
- {C619A811-8023-4441-B3D7-785388A09DF0}.Debug|Win32.Build.0 = Debug|Win32
{C619A811-8023-4441-B3D7-785388A09DF0}.Debug|x64.ActiveCfg = Debug|x64
- {C619A811-8023-4441-B3D7-785388A09DF0}.Debug|x64.Build.0 = Debug|x64
{C619A811-8023-4441-B3D7-785388A09DF0}.Release|Win32.ActiveCfg = Release|Win32
- {C619A811-8023-4441-B3D7-785388A09DF0}.Release|Win32.Build.0 = Release|Win32
{C619A811-8023-4441-B3D7-785388A09DF0}.Release|x64.ActiveCfg = Release|x64
- {C619A811-8023-4441-B3D7-785388A09DF0}.Release|x64.Build.0 = Release|x64
{E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Debug|Win32.ActiveCfg = Debug|Win32
{E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Debug|Win32.Build.0 = Debug|Win32
{E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/plugins/AutoRun/autorun.h b/plugins/AutoRun/autorun.h
index a991061066..8c621e2546 100644
--- a/plugins/AutoRun/autorun.h
+++ b/plugins/AutoRun/autorun.h
@@ -1,6 +1,8 @@
#define IDD_OPT_AUTORUN 101
#define IDC_AUTORUN 102
+#define _CRT_SECURE_NO_WARNINGS
+
#define MIRANDA_VER 0x0A00
#define SUB_KEY "Software\\Microsoft\\Windows\\CurrentVersion\\Run"
#define ModuleName "Autorun"
diff --git a/plugins/ClientChangeNotify/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/ClientChangeNotify.cpp
index 4d14b66e11..d70b76e943 100644
--- a/plugins/ClientChangeNotify/ClientChangeNotify.cpp
+++ b/plugins/ClientChangeNotify/ClientChangeNotify.cpp
@@ -143,7 +143,7 @@ static int CALLBACK MenuWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
}
-static VOID CALLBACK ShowContactMenu(UINT_PTR wParam)
+static VOID NTAPI ShowContactMenu(ULONG_PTR wParam)
// wParam = hContact
{
POINT pt;
diff --git a/plugins/UserGuide/commonheaders.h b/plugins/UserGuide/commonheaders.h
index 9ef8801e05..498dbb5b13 100644
--- a/plugins/UserGuide/commonheaders.h
+++ b/plugins/UserGuide/commonheaders.h
@@ -1,3 +1,5 @@
+#define _CRT_SECURE_NO_WARNINGS
+
#define MIRANDA_VER 0x0A00
#include <windows.h>
diff --git a/plugins/YAPP/common.h b/plugins/YAPP/common.h
index ad45eff2a5..8b11eca6f0 100644
--- a/plugins/YAPP/common.h
+++ b/plugins/YAPP/common.h
@@ -5,6 +5,8 @@
#pragma once
+#define _CRT_SECURE_NO_WARNINGS
+
// Modify the following defines if you have to target a platform prior to the ones specified below.
// Refer to MSDN for the latest info on corresponding values for different platforms.
#ifndef WINVER // Allow use of features specific to Windows XP or later.