Imported Upstream version 4.2.1.91

Former-commit-id: 5bd0f48812d39b3636887951adc772b94ef2f5af
This commit is contained in:
Xamarin Public Jenkins
2015-10-30 12:42:46 -04:00
committed by Jo Shields
parent 2faab2dafa
commit f1bb32afc3
48 changed files with 211 additions and 83 deletions

View File

@@ -549,8 +549,7 @@ namespace System {
return GetFolderPath (folder, SpecialFolderOption.None);
}
// for monotouch, not monotouch_runtime
#if !(MONOTOUCH && FULL_AOT_RUNTIME)
#if !MONOTOUCH
[MethodImplAttribute (MethodImplOptions.InternalCall)]
private extern static string GetWindowsFolderPath (int folder);