[Fix build break] In the previous change I exposed some APIs in mscorlib.dll to unblo...

[tfs-changeset: 1578199]

Commit migrated from https://github.com/dotnet/coreclr/commit/89f7be2c96392febd6ac0327d8d4a6317201d8fc

diff --git a/src/coreclr/src/vm/assemblyname.cpp b/src/coreclr/src/vm/assemblyname.cpp
index d7689e8..9ba5781 100644 (file)
--- a/src/coreclr/src/vm/assemblyname.cpp
+++ b/src/coreclr/src/vm/assemblyname.cpp
@@ -168,7 +168,6 @@ FCIMPL1(Object*, AssemblyNameNative::GetPublicKeyToken, Object* refThisUNSAFE)
 }
 FCIMPLEND
 
-#ifndef FEATURE_CORECLR
 FCIMPL1(Object*, AssemblyNameNative::EscapeCodeBase, StringObject* filenameUNSAFE)
 {
     FCALL_CONTRACT;
@@ -213,7 +212,6 @@ FCIMPL1(Object*, AssemblyNameNative::EscapeCodeBase, StringObject* filenameUNSAF
     return OBJECTREFToObject(rv);
 }
 FCIMPLEND
-#endif // !FEATURE_CORECLR
 
 FCIMPL4(void, AssemblyNameNative::Init, Object * refThisUNSAFE, OBJECTREF * pAssemblyRef, CLR_BOOL fForIntrospection, CLR_BOOL fRaiseResolveEvent)
 {

diff --git a/src/coreclr/src/vm/ecalllist.h b/src/coreclr/src/vm/ecalllist.h
index 2eef162..55a5896 100644 (file)
--- a/src/coreclr/src/vm/ecalllist.h
+++ b/src/coreclr/src/vm/ecalllist.h
@@ -497,10 +497,8 @@ FCFuncStart(gMetaDataImport)
     FCFuncElement("_GetName", MetaDataImport::GetName) 
     FCFuncElement("_GetUserString", MetaDataImport::GetUserString) 
     FCFuncElement("_GetScopeProps", MetaDataImport::GetScopeProps)  
-#ifndef FEATURE_CORECLR
     FCFuncElement("_GetClassLayout", MetaDataImport::GetClassLayout) 
     FCFuncElement("_GetSignatureFromToken", MetaDataImport::GetSignatureFromToken) 
-#endif // FEATURE_CORECLR
     FCFuncElement("_GetNamespace", MetaDataImport::GetNamespace) 
     FCFuncElement("_GetEventProps", MetaDataImport::GetEventProps)
     FCFuncElement("_GetFieldDefProps", MetaDataImport::GetFieldDefProps)
@@ -1114,8 +1112,8 @@ FCFuncStart(gAssemblyFuncs)
 #endif
     QCFuncElement("GetModules", AssemblyNative::GetModules)
     QCFuncElement("GetModule", AssemblyNative::GetModule)
-#ifndef FEATURE_CORECLR
     FCFuncElement("GetReferencedAssemblies", AssemblyNative::GetReferencedAssemblies)
+#ifndef FEATURE_CORECLR
     QCFuncElement("GetForwardedTypes", AssemblyNative::GetForwardedTypes)
 #endif  // FEATURE_CORECLR
     QCFuncElement("GetExportedTypes", AssemblyNative::GetExportedTypes)
@@ -1184,9 +1182,7 @@ FCFuncStart(gAssemblyNameFuncs)
 #endif // FEATURE_CORECLR
     FCFuncElement("nToString", AssemblyNameNative::ToString)
     FCFuncElement("nGetPublicKeyToken", AssemblyNameNative::GetPublicKeyToken)
-#ifndef FEATURE_CORECLR
     FCFuncElement("EscapeCodeBase", AssemblyNameNative::EscapeCodeBase)
-#endif // !FEATURE_CORECLR
     FCFuncElement("nInit", AssemblyNameNative::Init)
     FCFuncElement("ReferenceMatchesDefinitionInternal", AssemblyNameNative::ReferenceMatchesDefinition)
 FCFuncEnd()