You've already forked linux-packaging-mono
Imported Upstream version 6.0.0.246
Former-commit-id: 241b0eee0d9f22ae63312d981dd04646ce8514ed
This commit is contained in:
parent
fdf94592db
commit
65ce5c75f1
@@ -150,7 +150,7 @@ namespace System
|
||||
stdout = TextWriter.Synchronized (new UnexceptionalStreamWriter (OpenStandardOutput (0), outputEncoding) { AutoFlush = true });
|
||||
stderr = TextWriter.Synchronized (new UnexceptionalStreamWriter (OpenStandardError (0), outputEncoding) { AutoFlush = true });
|
||||
|
||||
#if MONODROID
|
||||
#if MONODROID && !MOBILE_DESKTOP_HOST
|
||||
if (LogcatTextWriter.IsRunningOnAndroid ()) {
|
||||
stdout = TextWriter.Synchronized (new LogcatTextWriter ("mono-stdout", stdout));
|
||||
stderr = TextWriter.Synchronized (new LogcatTextWriter ("mono-stderr", stderr));
|
||||
|
@@ -957,7 +957,7 @@ namespace System {
|
||||
}
|
||||
|
||||
// private methods
|
||||
#if (MONOTOUCH || MONODROID || XAMMAC)
|
||||
#if (MONOTOUCH || MONODROID || XAMMAC) && !MOBILE_DESKTOP_HOST
|
||||
internal const bool IsRunningOnWindows = false;
|
||||
#else
|
||||
internal static bool IsRunningOnWindows {
|
||||
|
@@ -149,7 +149,7 @@ namespace System
|
||||
return true;
|
||||
}
|
||||
|
||||
#if !MONODROID && !MONOTOUCH && !XAMMAC && !WASM
|
||||
#if (!MONODROID && !MONOTOUCH && !XAMMAC && !WASM) || MOBILE_DESKTOP_HOST
|
||||
static TimeZoneInfo CreateLocal ()
|
||||
{
|
||||
#if WIN_PLATFORM
|
||||
|
Reference in New Issue
Block a user