diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-07-05 17:58:51 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-07-05 17:58:51 +0400 |
| commit | 58d528567c5208c23ae7e6ce37d6e1f51d29771b (patch) | |
| tree | 3e8e6cb1d8197a29e761686941bf206579f583a7 /include/atl | |
| parent | 88ada695c8e17f9af095c17bc9b4a43277dd4c4f (diff) | |
fix the LNK4254 warnings
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@3325 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'include/atl')
| -rw-r--r-- | include/atl/atlisapi.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/atl/atlisapi.h b/include/atl/atlisapi.h index 5bf4f2f0f..9b8f51d90 100644 --- a/include/atl/atlisapi.h +++ b/include/atl/atlisapi.h @@ -10396,9 +10396,13 @@ __declspec(selectany) __declspec(allocate("ATLS$A")) ATL::_HANDLER_ENTRY * __phd __declspec(selectany) __declspec(allocate("ATLS$Z")) ATL::_HANDLER_ENTRY * __phdlrZ = NULL;
}
+/* MPC custom comment out fixing the following LNK4254 warning:
+section 'ATLS' (50000040) merged into '.rdata' (40000040) with different attributes
+
#if !defined(_M_IA64)
#pragma comment(linker, "/merge:ATLS=.rdata")
#endif
+*/
#ifndef HANDLER_ENTRY_PRAGMA
|