summaryrefslogtreecommitdiff
path: root/src/zap/zapimport.cpp
diff options
context:
space:
mode:
authorJohn Chen (JOCHEN7) <jochen@microsoft.com>2015-04-28 13:20:01 -0700
committerJohn Chen (JOCHEN7) <jochen@microsoft.com>2015-04-28 23:15:22 -0700
commite0c80c5f5c7d395d79aa350a26f46101a78af95d (patch)
treeec611fcee20f99810a6704c26c2e790884d42976 /src/zap/zapimport.cpp
parent1827eb2ae3201ccba95ca228d657041c8af3410c (diff)
downloadcoreclr-e0c80c5f5c7d395d79aa350a26f46101a78af95d.tar.gz
coreclr-e0c80c5f5c7d395d79aa350a26f46101a78af95d.tar.bz2
coreclr-e0c80c5f5c7d395d79aa350a26f46101a78af95d.zip
Build crossgen for Linux
- Crossgen is now built as part of coreclr - Crossgen successfully compiles mscorlib.dll - Resulting mscorlib.ni.dll not yet usable
Diffstat (limited to 'src/zap/zapimport.cpp')
-rw-r--r--src/zap/zapimport.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/zap/zapimport.cpp b/src/zap/zapimport.cpp
index 4867fc687e..22675d8181 100644
--- a/src/zap/zapimport.cpp
+++ b/src/zap/zapimport.cpp
@@ -341,7 +341,7 @@ ZapGenericSignature * ZapImportTable::GetGenericSignature(PVOID signature, BOOL
void * pMemory = new (m_pImage->GetHeap()) BYTE[cbAllocSize.Value()];
pGenericSignature = new (pMemory) ZapGenericSignature(cbSig);
- memcpy(pGenericSignature + 1, pSig, cbSig);
+ memcpy((void *)(pGenericSignature + 1), pSig, cbSig);
m_genericSignatures.Add(pGenericSignature);
@@ -421,7 +421,7 @@ void ZapImportSectionsTable::Save(ZapWriter * pZapWriter)
ZapImportSectionSignatures::ZapImportSectionSignatures(ZapImage * pImage, ZapVirtualSection * pImportSection, ZapVirtualSection * pGCSection)
- : m_pImage(pImage), m_pImportSection(pImportSection)
+ : m_pImportSection(pImportSection), m_pImage(pImage)
{
if (pGCSection != NULL)
{