summaryrefslogtreecommitdiff
path: root/src/ilasm/assem.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/ilasm/assem.cpp')
-rw-r--r--src/ilasm/assem.cpp22
1 files changed, 6 insertions, 16 deletions
diff --git a/src/ilasm/assem.cpp b/src/ilasm/assem.cpp
index 8c56bdc..1824762 100644
--- a/src/ilasm/assem.cpp
+++ b/src/ilasm/assem.cpp
@@ -15,15 +15,11 @@
#define DECLARE_DATA
#include "assembler.h"
-#ifdef FEATURE_CORECLR
#ifdef FEATURE_PAL
#include "coreclrloader.h"
CoreCLRLoader *g_loader;
#endif // FEATURE_PAL
MetaDataGetDispenserFunc metaDataGetDispenser;
-#else
-#include "MscorpeSxS.h"
-#endif // FEATURE_CORECLR
void indexKeywords(Indx* indx); // defined in asmparse.y
@@ -197,11 +193,9 @@ Assembler::~Assembler()
if (m_pCeeFileGen != NULL) {
if (m_pCeeFile)
m_pCeeFileGen->DestroyCeeFile(&m_pCeeFile);
-#ifdef FEATURE_CORECLR
+
DestroyICeeFileGen(&m_pCeeFileGen);
-#else
- MscorpeSxS::DestroyICeeFileGen(&m_pCeeFileGen);
-#endif
+
m_pCeeFileGen = NULL;
}
@@ -276,18 +270,14 @@ BOOL Assembler::Init()
if (m_pCeeFileGen != NULL) {
if (m_pCeeFile)
m_pCeeFileGen->DestroyCeeFile(&m_pCeeFile);
-#ifdef FEATURE_CORECLR
+
DestroyICeeFileGen(&m_pCeeFileGen);
-#else
- MscorpeSxS::DestroyICeeFileGen(&m_pCeeFileGen);
-#endif
+
m_pCeeFileGen = NULL;
}
-#ifdef FEATURE_CORECLR
+
if (FAILED(CreateICeeFileGen(&m_pCeeFileGen))) return FALSE;
-#else
- if (FAILED(MscorpeSxS::CreateICeeFileGen(&m_pCeeFileGen))) return FALSE;
-#endif
+
if (FAILED(m_pCeeFileGen->CreateCeeFileEx(&m_pCeeFile,(ULONG)m_dwCeeFileFlags))) return FALSE;
if (FAILED(m_pCeeFileGen->GetSectionCreate(m_pCeeFile, ".il", sdReadOnly, &m_pILSection))) return FALSE;